2019-08-30 09:13:11

by Krzysztof Wilczyński

Subject: [PATCH] leds: Move static keyword to the front of declarations

Move the static keyword to the front of declarations.

In drivers/leds/leds-lm3532.c for ramp_table, als_avrg_table
and als_imp_table, and in drivers/leds/leds-lm3532.c for
ramp_table.

This will resolve the following compiler warnings that can
be seen when building with warnings enabled (W=1):

drivers/leds/leds-lm3532.c:209:1: warning:
‘static’ is not at beginning of declaration [-Wold-style-declaration]

drivers/leds/leds-lm3532.c:266:1: warning:
‘static’ is not at beginning of declaration [-Wold-style-declaration]

drivers/leds/leds-lm3532.c:281:1: warning:
‘static’ is not at beginning of declaration [-Wold-style-declaration]

drivers/leds/leds-ti-lmu-common.c:14:1: warning:
‘static’ is not at beginning of declaration [-Wold-style-declaration]

Signed-off-by: Krzysztof Wilczynski <[email protected]>
---
Related: https://lore.kernel.org/r/[email protected]

drivers/leds/leds-lm3532.c | 6 +++---
drivers/leds/leds-ti-lmu-common.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/leds/leds-lm3532.c b/drivers/leds/leds-lm3532.c
index c5cfd8e3f15f..62ace6698d25 100644
--- a/drivers/leds/leds-lm3532.c
+++ b/drivers/leds/leds-lm3532.c
@@ -208,7 +208,7 @@ static const struct regmap_config lm3532_regmap_config = {
.cache_type = REGCACHE_FLAT,
};

-const static int als_imp_table[LM3532_NUM_IMP_VALS] = {37000, 18500, 12330,
+static const int als_imp_table[LM3532_NUM_IMP_VALS] = {37000, 18500, 12330,
92500, 7400, 6170, 5290,
4630, 4110, 3700, 3360,
3080, 2850, 2640, 2440,
@@ -265,7 +265,7 @@ static int lm3532_get_index(const int table[], int size, int value)
return -EINVAL;
}

-const static int als_avrg_table[LM3532_NUM_AVG_VALS] = {17920, 35840, 71680,
+static const int als_avrg_table[LM3532_NUM_AVG_VALS] = {17920, 35840, 71680,
1433360, 286720, 573440,
1146880, 2293760};
static int lm3532_get_als_avg_index(int avg_time)
@@ -280,7 +280,7 @@ static int lm3532_get_als_avg_index(int avg_time)
avg_time);
}

-const static int ramp_table[LM3532_NUM_RAMP_VALS] = { 8, 1024, 2048, 4096, 8192,
+static const int ramp_table[LM3532_NUM_RAMP_VALS] = { 8, 1024, 2048, 4096, 8192,
16384, 32768, 65536};
static int lm3532_get_ramp_index(int ramp_time)
{
diff --git a/drivers/leds/leds-ti-lmu-common.c b/drivers/leds/leds-ti-lmu-common.c
index e294a0b097e3..d7f10ad721ba 100644
--- a/drivers/leds/leds-ti-lmu-common.c
+++ b/drivers/leds/leds-ti-lmu-common.c
@@ -11,7 +11,7 @@

#include <linux/leds-ti-lmu-common.h>

-const static unsigned int ramp_table[16] = {2048, 262000, 524000, 1049000,
+static const unsigned int ramp_table[16] = {2048, 262000, 524000, 1049000,
2090000, 4194000, 8389000, 16780000, 33550000,
41940000, 50330000, 58720000, 67110000,
83880000, 100660000, 117440000};
--
2.22.1

2019-08-30 15:04:07

by Dan Murphy

Subject: Re: [PATCH] leds: Move static keyword to the front of declarations

Krzystof

Thanks for the patch

On 8/30/19 4:09 AM, Krzysztof Wilczynski wrote:
> Move the static keyword to the front of declarations.
>
> In drivers/leds/leds-lm3532.c for ramp_table, als_avrg_table
> and als_imp_table, and in drivers/leds/leds-lm3532.c for
> ramp_table.
>
> This will resolve the following compiler warnings that can
> be seen when building with warnings enabled (W=1):
>
> drivers/leds/leds-lm3532.c:209:1: warning:
> ‘static’ is not at beginning of declaration [-Wold-style-declaration]
>
> drivers/leds/leds-lm3532.c:266:1: warning:
> ‘static’ is not at beginning of declaration [-Wold-style-declaration]
>
> drivers/leds/leds-lm3532.c:281:1: warning:
> ‘static’ is not at beginning of declaration [-Wold-style-declaration]
>
> drivers/leds/leds-ti-lmu-common.c:14:1: warning:
> ‘static’ is not at beginning of declaration [-Wold-style-declaration]
>
> Signed-off-by: Krzysztof Wilczynski <[email protected]>
> ---
> Related: https://lore.kernel.org/r/[email protected]
>
> drivers/leds/leds-lm3532.c | 6 +++---
> drivers/leds/leds-ti-lmu-common.c | 2 +-

This file is missing in the subject.

Maybe break it out into a separate patch since they do not have
dependencies on each other.

Dan

2019-08-30 15:15:05

by Krzysztof Wilczynski

Subject: Re: [PATCH] leds: Move static keyword to the front of declarations

Hello Dan,

Thank you for feedback.
[...]
> This file is missing in the subject.
>
> Maybe break it out into a separate patch since they do not have
> dependencies on each other.

Will do. Sorry about that. I initially had these
as separate patches, but after looking at who the
maintainer is and thought that it perhaps makes
sense to send as a single patch. Good point.

Krzysztof

2019-08-30 18:12:25

by Krzysztof Wilczyński

Subject: [PATCH v2 1/2] leds: lm3532: Move static keyword to the front of declarations

Move the static keyword to the front of declarations ramp_table,
als_avrg_table and als_imp_table, and resolve the following
compiler warnings that can be seen when building with warnings
enabled (W=1):

drivers/leds/leds-lm3532.c:209:1: warning:
‘static’ is not at beginning of declaration [-Wold-style-declaration]

drivers/leds/leds-lm3532.c:266:1: warning:
‘static’ is not at beginning of declaration [-Wold-style-declaration]

drivers/leds/leds-lm3532.c:281:1: warning:
‘static’ is not at beginning of declaration [-Wold-style-declaration]

Signed-off-by: Krzysztof Wilczynski <[email protected]>
---
Related: https://lore.kernel.org/r/[email protected]

drivers/leds/leds-lm3532.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/leds/leds-lm3532.c b/drivers/leds/leds-lm3532.c
index c5cfd8e3f15f..62ace6698d25 100644
--- a/drivers/leds/leds-lm3532.c
+++ b/drivers/leds/leds-lm3532.c
@@ -208,7 +208,7 @@ static const struct regmap_config lm3532_regmap_config = {
.cache_type = REGCACHE_FLAT,
};

-const static int als_imp_table[LM3532_NUM_IMP_VALS] = {37000, 18500, 12330,
+static const int als_imp_table[LM3532_NUM_IMP_VALS] = {37000, 18500, 12330,
92500, 7400, 6170, 5290,
4630, 4110, 3700, 3360,
3080, 2850, 2640, 2440,
@@ -265,7 +265,7 @@ static int lm3532_get_index(const int table[], int size, int value)
return -EINVAL;
}

-const static int als_avrg_table[LM3532_NUM_AVG_VALS] = {17920, 35840, 71680,
+static const int als_avrg_table[LM3532_NUM_AVG_VALS] = {17920, 35840, 71680,
1433360, 286720, 573440,
1146880, 2293760};
static int lm3532_get_als_avg_index(int avg_time)
@@ -280,7 +280,7 @@ static int lm3532_get_als_avg_index(int avg_time)
avg_time);
}

-const static int ramp_table[LM3532_NUM_RAMP_VALS] = { 8, 1024, 2048, 4096, 8192,
+static const int ramp_table[LM3532_NUM_RAMP_VALS] = { 8, 1024, 2048, 4096, 8192,
16384, 32768, 65536};
static int lm3532_get_ramp_index(int ramp_time)
{
--
2.22.1

2019-09-03 18:52:55

by Jacek Anaszewski

Subject: Re: [PATCH v2 1/2] leds: lm3532: Move static keyword to the front of declarations

Hi Krzysztof,

Thank you for the patch set.

On 8/30/19 8:11 PM, Krzysztof Wilczynski wrote:
> Move the static keyword to the front of declarations ramp_table,
> als_avrg_table and als_imp_table, and resolve the following
> compiler warnings that can be seen when building with warnings
> enabled (W=1):
>
> drivers/leds/leds-lm3532.c:209:1: warning:
> ‘static’ is not at beginning of declaration [-Wold-style-declaration]
>
> drivers/leds/leds-lm3532.c:266:1: warning:
> ‘static’ is not at beginning of declaration [-Wold-style-declaration]
>
> drivers/leds/leds-lm3532.c:281:1: warning:
> ‘static’ is not at beginning of declaration [-Wold-style-declaration]
>
> Signed-off-by: Krzysztof Wilczynski <[email protected]>
> ---
> Related: https://lore.kernel.org/r/[email protected]
>
> drivers/leds/leds-lm3532.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/leds/leds-lm3532.c b/drivers/leds/leds-lm3532.c
> index c5cfd8e3f15f..62ace6698d25 100644
> --- a/drivers/leds/leds-lm3532.c
> +++ b/drivers/leds/leds-lm3532.c
> @@ -208,7 +208,7 @@ static const struct regmap_config lm3532_regmap_config = {
> .cache_type = REGCACHE_FLAT,
> };
>
> -const static int als_imp_table[LM3532_NUM_IMP_VALS] = {37000, 18500, 12330,
> +static const int als_imp_table[LM3532_NUM_IMP_VALS] = {37000, 18500, 12330,
> 92500, 7400, 6170, 5290,
> 4630, 4110, 3700, 3360,
> 3080, 2850, 2640, 2440,
> @@ -265,7 +265,7 @@ static int lm3532_get_index(const int table[], int size, int value)
> return -EINVAL;
> }
>
> -const static int als_avrg_table[LM3532_NUM_AVG_VALS] = {17920, 35840, 71680,
> +static const int als_avrg_table[LM3532_NUM_AVG_VALS] = {17920, 35840, 71680,
> 1433360, 286720, 573440,
> 1146880, 2293760};
> static int lm3532_get_als_avg_index(int avg_time)
> @@ -280,7 +280,7 @@ static int lm3532_get_als_avg_index(int avg_time)
> avg_time);
> }
>
> -const static int ramp_table[LM3532_NUM_RAMP_VALS] = { 8, 1024, 2048, 4096, 8192,
> +static const int ramp_table[LM3532_NUM_RAMP_VALS] = { 8, 1024, 2048, 4096, 8192,
> 16384, 32768, 65536};
> static int lm3532_get_ramp_index(int ramp_time)
> {
>

Both 1/2 and 2/2 applied.

--
Best regards,
Jacek Anaszewski