[PATCH 1/5] leds: leds-ss4200: fix incorrect placement of __initdata marker

[PATCH 1/5] leds: leds-ss4200: fix incorrect placement of __initdata marker

[Jingoo Han]

The __initdata marker can be virtually anywhere on the line,
EXCEPT right after "struct". The preferred location is before
the "=" sign if there is one, or before the trailing ";"
otherwise. It also fixes the following chechpatch warning.

  WARNING: __initdata should be placed after nodetect

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/leds/leds-ss4200.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
index 5b8f938..3faf550 100644
--- a/drivers/leds/leds-ss4200.c
+++ b/drivers/leds/leds-ss4200.c
@@ -78,7 +78,7 @@ static int __init ss4200_led_dmi_callback(const struct dmi_system_id *id)
 	return 1;
 }
 
-static bool __initdata nodetect;
+static bool nodetect __initdata;
 module_param_named(nodetect, nodetect, bool, 0);
 MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
 
-- 
1.7.10.4

[PATCH 2/5] leds: leds-ss4200: remove DEFINE_PCI_DEVICE_TABLE macro

[Jingoo Han]

Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
is deprecated.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/leds/leds-ss4200.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
index 3faf550..7dd033d 100644
--- a/drivers/leds/leds-ss4200.c
+++ b/drivers/leds/leds-ss4200.c
@@ -63,7 +63,7 @@ MODULE_LICENSE("GPL");
 /*
  * PCI ID of the Intel ICH7 LPC Device within which the GPIO block lives.
  */
-static DEFINE_PCI_DEVICE_TABLE(ich7_lpc_pci_id) = {
+static const struct pci_device_id ich7_lpc_pci_id[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_1) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_30) },
-- 
1.7.10.4

Re: [PATCH 2/5] leds: leds-ss4200: remove DEFINE_PCI_DEVICE_TABLE macro

[Bryan Wu]

On Tue, Feb 25, 2014 at 9:10 PM, Jingoo Han <jg1.han@samsung.com> wrote:
> Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
> is deprecated.
>

Applied, thanks,
-Bryan

> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
>  drivers/leds/leds-ss4200.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
> index 3faf550..7dd033d 100644
> --- a/drivers/leds/leds-ss4200.c
> +++ b/drivers/leds/leds-ss4200.c
> @@ -63,7 +63,7 @@ MODULE_LICENSE("GPL");
>  /*
>   * PCI ID of the Intel ICH7 LPC Device within which the GPIO block lives.
>   */
> -static DEFINE_PCI_DEVICE_TABLE(ich7_lpc_pci_id) = {
> +static const struct pci_device_id ich7_lpc_pci_id[] = {
>         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0) },
>         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_1) },
>         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_30) },
> --
> 1.7.10.4
>
>

[PATCH 3/5] leds: lp5562: remove unnecessary parentheses

[Jingoo Han]

Remove unnecessary parentheses in order to fix the following
checkpatch error.

  ERROR: return is not a function, parentheses are not required

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/leds/leds-lp5562.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/leds/leds-lp5562.c b/drivers/leds/leds-lp5562.c
index 315d3ca..ca85724 100644
--- a/drivers/leds/leds-lp5562.c
+++ b/drivers/leds/leds-lp5562.c
@@ -346,9 +346,9 @@ static void lp5562_write_program_memory(struct lp55xx_chip *chip,
 /* check the size of program count */
 static inline bool _is_pc_overflow(struct lp55xx_predef_pattern *ptn)
 {
-	return (ptn->size_r >= LP5562_PROGRAM_LENGTH ||
-		ptn->size_g >= LP5562_PROGRAM_LENGTH ||
-		ptn->size_b >= LP5562_PROGRAM_LENGTH);
+	return ptn->size_r >= LP5562_PROGRAM_LENGTH ||
+	       ptn->size_g >= LP5562_PROGRAM_LENGTH ||
+	       ptn->size_b >= LP5562_PROGRAM_LENGTH;
 }
 
 static int lp5562_run_predef_led_pattern(struct lp55xx_chip *chip, int mode)
-- 
1.7.10.4

Re: [PATCH 3/5] leds: lp5562: remove unnecessary parentheses

[Bryan Wu]

On Tue, Feb 25, 2014 at 9:11 PM, Jingoo Han <jg1.han@samsung.com> wrote:
> Remove unnecessary parentheses in order to fix the following
> checkpatch error.
>
>   ERROR: return is not a function, parentheses are not required
>

Applied, thanks,
-Bryan

> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
>  drivers/leds/leds-lp5562.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/leds/leds-lp5562.c b/drivers/leds/leds-lp5562.c
> index 315d3ca..ca85724 100644
> --- a/drivers/leds/leds-lp5562.c
> +++ b/drivers/leds/leds-lp5562.c
> @@ -346,9 +346,9 @@ static void lp5562_write_program_memory(struct lp55xx_chip *chip,
>  /* check the size of program count */
>  static inline bool _is_pc_overflow(struct lp55xx_predef_pattern *ptn)
>  {
> -       return (ptn->size_r >= LP5562_PROGRAM_LENGTH ||
> -               ptn->size_g >= LP5562_PROGRAM_LENGTH ||
> -               ptn->size_b >= LP5562_PROGRAM_LENGTH);
> +       return ptn->size_r >= LP5562_PROGRAM_LENGTH ||
> +              ptn->size_g >= LP5562_PROGRAM_LENGTH ||
> +              ptn->size_b >= LP5562_PROGRAM_LENGTH;
>  }
>
>  static int lp5562_run_predef_led_pattern(struct lp55xx_chip *chip, int mode)
> --
> 1.7.10.4
>
>

[PATCH 4/5] leds: clevo-mail: fix incorrect placement of __initdata marker

[Jingoo Han]

The __initdata marker can be virtually anywhere on the line,
EXCEPT right after "struct". The preferred location is before
the "=" sign if there is one, or before the trailing ";"
otherwise. It also fixes the following chechpatch warning.

  WARNING: __initdata should be placed after nodetect

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/leds/leds-clevo-mail.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
index d93e245..5974810 100644
--- a/drivers/leds/leds-clevo-mail.c
+++ b/drivers/leds/leds-clevo-mail.c
@@ -19,7 +19,7 @@ MODULE_AUTHOR("Márton Németh <nm127@freemail.hu>");
 MODULE_DESCRIPTION("Clevo mail LED driver");
 MODULE_LICENSE("GPL");
 
-static bool __initdata nodetect;
+static bool nodetect __initdata;
 module_param_named(nodetect, nodetect, bool, 0);
 MODULE_PARM_DESC(nodetect, "Skip DMI hardware detection");
 
-- 
1.7.10.4

Re: [PATCH 4/5] leds: clevo-mail: fix incorrect placement of __initdata marker

[Uwe Kleine-König]

Hello,

On Wed, Feb 26, 2014 at 02:14:49PM +0900, Jingoo Han wrote:
> diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
> index d93e245..5974810 100644
> --- a/drivers/leds/leds-clevo-mail.c
> +++ b/drivers/leds/leds-clevo-mail.c
> @@ -19,7 +19,7 @@ MODULE_AUTHOR("Márton Németh <nm127@freemail.hu>");
>  MODULE_DESCRIPTION("Clevo mail LED driver");
>  MODULE_LICENSE("GPL");
>  
> -static bool __initdata nodetect;
> +static bool nodetect __initdata;
>  module_param_named(nodetect, nodetect, bool, 0);
>  MODULE_PARM_DESC(nodetect, "Skip DMI hardware detection");
not sure why I'm on Cc, but yes, the change is in line with gcc docs.
But I wonder if __initdata is ok for a variable backing a module
parameter as it appears in /sys. Does

	cat /sys/module/leds-clevo-mail/parameters/nodetect

result in an oops? If yes, better drop the __initdata instead of moving
it.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

Re: [PATCH 4/5] leds: clevo-mail: fix incorrect placement of __initdata marker

[Bryan Wu]

On Wed, Feb 26, 2014 at 12:30 AM, Uwe Kleine-König
<u.kleine-koenig@pengutronix.de> wrote:
> Hello,
>
> On Wed, Feb 26, 2014 at 02:14:49PM +0900, Jingoo Han wrote:
>> diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
>> index d93e245..5974810 100644
>> --- a/drivers/leds/leds-clevo-mail.c
>> +++ b/drivers/leds/leds-clevo-mail.c
>> @@ -19,7 +19,7 @@ MODULE_AUTHOR("Márton Németh <nm127@freemail.hu>");
>>  MODULE_DESCRIPTION("Clevo mail LED driver");
>>  MODULE_LICENSE("GPL");
>>
>> -static bool __initdata nodetect;
>> +static bool nodetect __initdata;
>>  module_param_named(nodetect, nodetect, bool, 0);
>>  MODULE_PARM_DESC(nodetect, "Skip DMI hardware detection");
> not sure why I'm on Cc, but yes, the change is in line with gcc docs.
> But I wonder if __initdata is ok for a variable backing a module
> parameter as it appears in /sys. Does
>
>         cat /sys/module/leds-clevo-mail/parameters/nodetect
>
> result in an oops? If yes, better drop the __initdata instead of moving
> it.

Agree with Uwe, I think we'd better drop it. It is not right for a
module parameter.

And please update a previous similar patch as well.

Thanks,
-Bryan

[PATCH 5/5] leds: blinkm: remove unnecessary spaces

[Jingoo Han]

Remove unnecessary space in order to fix the following
checkpatch issues.

  WARNING: space prohibited before semicolon

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/leds/leds-blinkm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c
index 0c50860..d0452b0 100644
--- a/drivers/leds/leds-blinkm.c
+++ b/drivers/leds/leds-blinkm.c
@@ -443,7 +443,7 @@ static void led_work(struct work_struct *work)
 {
 	int ret;
 	struct blinkm_led *led;
-	struct blinkm_data *data ;
+	struct blinkm_data *data;
 	struct blinkm_work *blm_work = work_to_blmwork(work);
 
 	led = blm_work->blinkm_led;
-- 
1.7.10.4

Re: [PATCH 5/5] leds: blinkm: remove unnecessary spaces

[Jan-Simon Möller]

Acked-by: Jan-Simon Möller <dl9pf@gmx.de>

-- 

Dipl.-Ing.
Jan-Simon Möller

jansimon.moeller@gmx.de
Am Mittwoch, 26. Februar 2014, 14:16:11 schrieb Jingoo Han:
> Remove unnecessary space in order to fix the following
> checkpatch issues.
> 
>   WARNING: space prohibited before semicolon
> 
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
>  drivers/leds/leds-blinkm.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c
> index 0c50860..d0452b0 100644
> --- a/drivers/leds/leds-blinkm.c
> +++ b/drivers/leds/leds-blinkm.c
> @@ -443,7 +443,7 @@ static void led_work(struct work_struct *work)
>  {
>  	int ret;
>  	struct blinkm_led *led;
> -	struct blinkm_data *data ;
> +	struct blinkm_data *data;
>  	struct blinkm_work *blm_work = work_to_blmwork(work);
> 
>  	led = blm_work->blinkm_led;

Re: [PATCH 5/5] leds: blinkm: remove unnecessary spaces

[Bryan Wu]

On Tue, Feb 25, 2014 at 10:25 PM, Jan-Simon Möller <dl9pf@gmx.de> wrote:
> Acked-by: Jan-Simon Möller <dl9pf@gmx.de>
>

Thanks, applied,
-Bryan

> --
>
> Dipl.-Ing.
> Jan-Simon Möller
>
> jansimon.moeller@gmx.de
> Am Mittwoch, 26. Februar 2014, 14:16:11 schrieb Jingoo Han:
>> Remove unnecessary space in order to fix the following
>> checkpatch issues.
>>
>>   WARNING: space prohibited before semicolon
>>
>> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
>> ---
>>  drivers/leds/leds-blinkm.c |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c
>> index 0c50860..d0452b0 100644
>> --- a/drivers/leds/leds-blinkm.c
>> +++ b/drivers/leds/leds-blinkm.c
>> @@ -443,7 +443,7 @@ static void led_work(struct work_struct *work)
>>  {
>>       int ret;
>>       struct blinkm_led *led;
>> -     struct blinkm_data *data ;
>> +     struct blinkm_data *data;
>>       struct blinkm_work *blm_work = work_to_blmwork(work);
>>
>>       led = blm_work->blinkm_led;
>

Re: [PATCH 1/5] leds: leds-ss4200: fix incorrect placement of __initdata marker

[Bryan Wu]

On Tue, Feb 25, 2014 at 9:09 PM, Jingoo Han <jg1.han@samsung.com> wrote:
> The __initdata marker can be virtually anywhere on the line,
> EXCEPT right after "struct". The preferred location is before
> the "=" sign if there is one, or before the trailing ";"
> otherwise. It also fixes the following chechpatch warning.
>
>   WARNING: __initdata should be placed after nodetect
>

Good, I merged it.
Thanks, -Bryan

> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
>  drivers/leds/leds-ss4200.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
> index 5b8f938..3faf550 100644
> --- a/drivers/leds/leds-ss4200.c
> +++ b/drivers/leds/leds-ss4200.c
> @@ -78,7 +78,7 @@ static int __init ss4200_led_dmi_callback(const struct dmi_system_id *id)
>         return 1;
>  }
>
> -static bool __initdata nodetect;
> +static bool nodetect __initdata;
>  module_param_named(nodetect, nodetect, bool, 0);
>  MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
>
> --
> 1.7.10.4
>
>