| From e979629fe67b5486877cf21fc439a840b5185ad2 Mon Sep 17 00:00:00 2001 |
| From: Krzysztof Wilczynski <kw@linux.com> |
| Date: Fri, 13 Sep 2019 22:24:13 +0200 |
| Subject: [PATCH] iio: light: bh1750: Resolve compiler warning and make code |
| more readable |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit f552fde983d378e7339f9ea74a25f918563bf0d3 upstream. |
| |
| Separate the declaration of struct bh1750_chip_info from definition |
| of bh1750_chip_info_tbl[] in a single statement as it makes the code |
| hard to read, and with the extra newline it makes it look as if the |
| bh1750_chip_info_tbl[] had no explicit type. |
| |
| This change also resolves the following compiler warning about the |
| unusual position of the static keyword that can be seen when building |
| with warnings enabled (W=1): |
| |
| drivers/iio/light/bh1750.c:64:1: warning: |
| ‘static’ is not at beginning of declaration [-Wold-style-declaration] |
| |
| Related to commit 3a11fbb037a1 ("iio: light: add support for ROHM |
| BH1710/BH1715/BH1721/BH1750/BH1751 ambient light sensors"). |
| |
| Signed-off-by: Krzysztof Wilczynski <kw@linux.com> |
| Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> |
| Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/iio/light/bh1750.c b/drivers/iio/light/bh1750.c |
| index 28347df78cff..adb5ab9e3439 100644 |
| --- a/drivers/iio/light/bh1750.c |
| +++ b/drivers/iio/light/bh1750.c |
| @@ -59,9 +59,9 @@ struct bh1750_chip_info { |
| |
| u16 int_time_low_mask; |
| u16 int_time_high_mask; |
| -} |
| +}; |
| |
| -static const bh1750_chip_info_tbl[] = { |
| +static const struct bh1750_chip_info bh1750_chip_info_tbl[] = { |
| [BH1710] = { 140, 1022, 300, 400, 250000000, 2, 0x001F, 0x03E0 }, |
| [BH1721] = { 140, 1020, 300, 400, 250000000, 2, 0x0010, 0x03E0 }, |
| [BH1750] = { 31, 254, 69, 1740, 57500000, 1, 0x001F, 0x00E0 }, |
| -- |
| 2.7.4 |
| |