diff mbox

[v2,6/6] dell-led: move driver to drivers/platform/x86/dell-wmi-led.c

Message ID 20170116132204.6421-7-kernel@kempniu.pl (mailing list archive)
State Awaiting Upstream, archived
Delegated to: Andy Shevchenko
Headers show

Commit Message

Michał Kępień Jan. 16, 2017, 1:22 p.m. UTC
The dell-led driver handles a specific WMI GUID present on some Dell
laptops and as such it belongs in the x86 platform driver subsystem.
Source code is moved along with the relevant Kconfig and Makefile
entries, with some minor modifications:

  - Kconfig option is renamed from CONFIG_LEDS_DELL_NETBOOKS to
    CONFIG_DELL_WMI_LED,

  - the X86 Kconfig dependency is removed as the whole
    drivers/platform/x86 menu depends on it, so there is no need to
    duplicate it,

  - the name of the module's source file is removed from the header
    comment to avoid the need to update it in the future.

Signed-off-by: Michał Kępień <kernel@kempniu.pl>
---
 drivers/leds/Kconfig                                     | 8 --------
 drivers/leds/Makefile                                    | 1 -
 drivers/platform/x86/Kconfig                             | 8 ++++++++
 drivers/platform/x86/Makefile                            | 1 +
 drivers/{leds/dell-led.c => platform/x86/dell-wmi-led.c} | 2 --
 5 files changed, 9 insertions(+), 11 deletions(-)
 rename drivers/{leds/dell-led.c => platform/x86/dell-wmi-led.c} (99%)

Comments

Jacek Anaszewski Jan. 16, 2017, 8:49 p.m. UTC | #1
Hi Michał,

Thanks for the patch set.

Would you mind fixing also the following issues raised by
checkpatch.pl?:

WARNING: Missing a blank line after declarations
#376: FILE: drivers/platform/x86/dell-wmi-led.c:64:
+	struct bios_args args;
+	args.length = length;

WARNING: Block comments use * on subsequent lines
#460: FILE: drivers/platform/x86/dell-wmi-led.c:148:
+	/* The Dell LED delay is based on 125ms intervals.
+	   Need to round up to next interval. */

WARNING: Block comments use a trailing */ on a separate line
#460: FILE: drivers/platform/x86/dell-wmi-led.c:148:
+	   Need to round up to next interval. */

WARNING: Comparisons should place the constant on the right side of the test
#463: FILE: drivers/platform/x86/dell-wmi-led.c:151:
+	if (0 == on_eighths)

WARNING: Comparisons should place the constant on the right side of the test
#470: FILE: drivers/platform/x86/dell-wmi-led.c:158:
+	if (0 == off_eighths)

The fixes could be placed in an incremental patch after this one.

Best regards,
Jacek Anaszewski


On 01/16/2017 02:22 PM, Michał Kępień wrote:
> The dell-led driver handles a specific WMI GUID present on some Dell
> laptops and as such it belongs in the x86 platform driver subsystem.
> Source code is moved along with the relevant Kconfig and Makefile
> entries, with some minor modifications:
> 
>   - Kconfig option is renamed from CONFIG_LEDS_DELL_NETBOOKS to
>     CONFIG_DELL_WMI_LED,
> 
>   - the X86 Kconfig dependency is removed as the whole
>     drivers/platform/x86 menu depends on it, so there is no need to
>     duplicate it,
> 
>   - the name of the module's source file is removed from the header
>     comment to avoid the need to update it in the future.
> 
> Signed-off-by: Michał Kępień <kernel@kempniu.pl>
> ---
>  drivers/leds/Kconfig                                     | 8 --------
>  drivers/leds/Makefile                                    | 1 -
>  drivers/platform/x86/Kconfig                             | 8 ++++++++
>  drivers/platform/x86/Makefile                            | 1 +
>  drivers/{leds/dell-led.c => platform/x86/dell-wmi-led.c} | 2 --
>  5 files changed, 9 insertions(+), 11 deletions(-)
>  rename drivers/{leds/dell-led.c => platform/x86/dell-wmi-led.c} (99%)
> 
> diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
> index f29b8698ca88..5af3fb2f52e4 100644
> --- a/drivers/leds/Kconfig
> +++ b/drivers/leds/Kconfig
> @@ -454,14 +454,6 @@ config LEDS_ADP5520
>  	  To compile this driver as a module, choose M here: the module will
>  	  be called leds-adp5520.
>  
> -config LEDS_DELL_NETBOOKS
> -	tristate "External LED on Dell Business Netbooks"
> -	depends on LEDS_CLASS
> -	depends on X86 && ACPI_WMI
> -	help
> -	  This adds support for the Latitude 2100 and similar
> -	  notebooks that have an external LED.
> -
>  config LEDS_MC13783
>  	tristate "LED Support for MC13XXX PMIC"
>  	depends on LEDS_CLASS
> diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
> index 6b8273736478..558d24675454 100644
> --- a/drivers/leds/Makefile
> +++ b/drivers/leds/Makefile
> @@ -52,7 +52,6 @@ obj-$(CONFIG_LEDS_REGULATOR)		+= leds-regulator.o
>  obj-$(CONFIG_LEDS_INTEL_SS4200)		+= leds-ss4200.o
>  obj-$(CONFIG_LEDS_LT3593)		+= leds-lt3593.o
>  obj-$(CONFIG_LEDS_ADP5520)		+= leds-adp5520.o
> -obj-$(CONFIG_LEDS_DELL_NETBOOKS)	+= dell-led.o
>  obj-$(CONFIG_LEDS_MC13783)		+= leds-mc13783.o
>  obj-$(CONFIG_LEDS_NS2)			+= leds-ns2.o
>  obj-$(CONFIG_LEDS_NETXBIG)		+= leds-netxbig.o
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 81b8dcca8891..f9018e8c1e49 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -143,6 +143,14 @@ config DELL_WMI_AIO
>  	  To compile this driver as a module, choose M here: the module will
>  	  be called dell-wmi-aio.
>  
> +config DELL_WMI_LED
> +	tristate "External LED on Dell Business Netbooks"
> +	depends on LEDS_CLASS
> +	depends on ACPI_WMI
> +	help
> +	  This adds support for the Latitude 2100 and similar
> +	  notebooks that have an external LED.
> +
>  config DELL_SMO8800
>  	tristate "Dell Latitude freefall driver (ACPI SMO88XX)"
>  	depends on ACPI
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index 2efa86d2a1a7..b061817ecaf1 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -15,6 +15,7 @@ obj-$(CONFIG_DELL_SMBIOS)	+= dell-smbios.o
>  obj-$(CONFIG_DELL_LAPTOP)	+= dell-laptop.o
>  obj-$(CONFIG_DELL_WMI)		+= dell-wmi.o
>  obj-$(CONFIG_DELL_WMI_AIO)	+= dell-wmi-aio.o
> +obj-$(CONFIG_DELL_WMI_LED)	+= dell-wmi-led.o
>  obj-$(CONFIG_DELL_SMO8800)	+= dell-smo8800.o
>  obj-$(CONFIG_DELL_RBTN)		+= dell-rbtn.o
>  obj-$(CONFIG_ACER_WMI)		+= acer-wmi.o
> diff --git a/drivers/leds/dell-led.c b/drivers/platform/x86/dell-wmi-led.c
> similarity index 99%
> rename from drivers/leds/dell-led.c
> rename to drivers/platform/x86/dell-wmi-led.c
> index e5c57389efd6..d0232c7f1909 100644
> --- a/drivers/leds/dell-led.c
> +++ b/drivers/platform/x86/dell-wmi-led.c
> @@ -1,6 +1,4 @@
>  /*
> - * dell_led.c - Dell LED Driver
> - *
>   * Copyright (C) 2010 Dell Inc.
>   * Louis Davis <louis_davis@dell.com>
>   * Jim Dailey <jim_dailey@dell.com>
>
Pavel Machek Jan. 17, 2017, 11:08 a.m. UTC | #2
Hi!

> Thanks for the patch set.
> 
> Would you mind fixing also the following issues raised by
> checkpatch.pl?:
> 
> WARNING: Missing a blank line after declarations
> #376: FILE: drivers/platform/x86/dell-wmi-led.c:64:
> +	struct bios_args args;
...
> The fixes could be placed in an incremental patch after this one.

Anyway, move itself is ok (and the checkpatch issues are not that serious anyway.)

Thanks,

Acked-by: Pavel Machek <pavel@ucw.cz>
Pali Rohár Jan. 17, 2017, 11:28 a.m. UTC | #3
On Tuesday 17 January 2017 12:08:09 Pavel Machek wrote:
> Hi!
> 
> > Thanks for the patch set.
> > 
> > Would you mind fixing also the following issues raised by
> > checkpatch.pl?:
> > 
> > WARNING: Missing a blank line after declarations
> > #376: FILE: drivers/platform/x86/dell-wmi-led.c:64:
> > +	struct bios_args args;
> ...
> > The fixes could be placed in an incremental patch after this one.
> 
> Anyway, move itself is ok (and the checkpatch issues are not that serious anyway.)
> 
> Thanks,
> 
> Acked-by: Pavel Machek <pavel@ucw.cz>

Yes, this patch does not change code, just move one file to other
location. You can add my Reviewed-by.
Andy Shevchenko Jan. 18, 2017, 7:08 p.m. UTC | #4
On Mon, Jan 16, 2017 at 3:22 PM, Michał Kępień <kernel@kempniu.pl> wrote:
> The dell-led driver handles a specific WMI GUID present on some Dell
> laptops and as such it belongs in the x86 platform driver subsystem.
> Source code is moved along with the relevant Kconfig and Makefile
> entries, with some minor modifications:
>
>   - Kconfig option is renamed from CONFIG_LEDS_DELL_NETBOOKS to
>     CONFIG_DELL_WMI_LED,
>
>   - the X86 Kconfig dependency is removed as the whole
>     drivers/platform/x86 menu depends on it, so there is no need to
>     duplicate it,
>
>   - the name of the module's source file is removed from the header
>     comment to avoid the need to update it in the future.
>

Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>

> Signed-off-by: Michał Kępień <kernel@kempniu.pl>
> ---
>  drivers/leds/Kconfig                                     | 8 --------
>  drivers/leds/Makefile                                    | 1 -
>  drivers/platform/x86/Kconfig                             | 8 ++++++++
>  drivers/platform/x86/Makefile                            | 1 +
>  drivers/{leds/dell-led.c => platform/x86/dell-wmi-led.c} | 2 --
>  5 files changed, 9 insertions(+), 11 deletions(-)
>  rename drivers/{leds/dell-led.c => platform/x86/dell-wmi-led.c} (99%)
>
> diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
> index f29b8698ca88..5af3fb2f52e4 100644
> --- a/drivers/leds/Kconfig
> +++ b/drivers/leds/Kconfig
> @@ -454,14 +454,6 @@ config LEDS_ADP5520
>           To compile this driver as a module, choose M here: the module will
>           be called leds-adp5520.
>
> -config LEDS_DELL_NETBOOKS
> -       tristate "External LED on Dell Business Netbooks"
> -       depends on LEDS_CLASS
> -       depends on X86 && ACPI_WMI
> -       help
> -         This adds support for the Latitude 2100 and similar
> -         notebooks that have an external LED.
> -
>  config LEDS_MC13783
>         tristate "LED Support for MC13XXX PMIC"
>         depends on LEDS_CLASS
> diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
> index 6b8273736478..558d24675454 100644
> --- a/drivers/leds/Makefile
> +++ b/drivers/leds/Makefile
> @@ -52,7 +52,6 @@ obj-$(CONFIG_LEDS_REGULATOR)          += leds-regulator.o
>  obj-$(CONFIG_LEDS_INTEL_SS4200)                += leds-ss4200.o
>  obj-$(CONFIG_LEDS_LT3593)              += leds-lt3593.o
>  obj-$(CONFIG_LEDS_ADP5520)             += leds-adp5520.o
> -obj-$(CONFIG_LEDS_DELL_NETBOOKS)       += dell-led.o
>  obj-$(CONFIG_LEDS_MC13783)             += leds-mc13783.o
>  obj-$(CONFIG_LEDS_NS2)                 += leds-ns2.o
>  obj-$(CONFIG_LEDS_NETXBIG)             += leds-netxbig.o
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 81b8dcca8891..f9018e8c1e49 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -143,6 +143,14 @@ config DELL_WMI_AIO
>           To compile this driver as a module, choose M here: the module will
>           be called dell-wmi-aio.
>
> +config DELL_WMI_LED
> +       tristate "External LED on Dell Business Netbooks"
> +       depends on LEDS_CLASS
> +       depends on ACPI_WMI
> +       help
> +         This adds support for the Latitude 2100 and similar
> +         notebooks that have an external LED.
> +
>  config DELL_SMO8800
>         tristate "Dell Latitude freefall driver (ACPI SMO88XX)"
>         depends on ACPI
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index 2efa86d2a1a7..b061817ecaf1 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -15,6 +15,7 @@ obj-$(CONFIG_DELL_SMBIOS)     += dell-smbios.o
>  obj-$(CONFIG_DELL_LAPTOP)      += dell-laptop.o
>  obj-$(CONFIG_DELL_WMI)         += dell-wmi.o
>  obj-$(CONFIG_DELL_WMI_AIO)     += dell-wmi-aio.o
> +obj-$(CONFIG_DELL_WMI_LED)     += dell-wmi-led.o
>  obj-$(CONFIG_DELL_SMO8800)     += dell-smo8800.o
>  obj-$(CONFIG_DELL_RBTN)                += dell-rbtn.o
>  obj-$(CONFIG_ACER_WMI)         += acer-wmi.o
> diff --git a/drivers/leds/dell-led.c b/drivers/platform/x86/dell-wmi-led.c
> similarity index 99%
> rename from drivers/leds/dell-led.c
> rename to drivers/platform/x86/dell-wmi-led.c
> index e5c57389efd6..d0232c7f1909 100644
> --- a/drivers/leds/dell-led.c
> +++ b/drivers/platform/x86/dell-wmi-led.c
> @@ -1,6 +1,4 @@
>  /*
> - * dell_led.c - Dell LED Driver
> - *
>   * Copyright (C) 2010 Dell Inc.
>   * Louis Davis <louis_davis@dell.com>
>   * Jim Dailey <jim_dailey@dell.com>
> --
> 2.11.0
>
diff mbox

Patch

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index f29b8698ca88..5af3fb2f52e4 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -454,14 +454,6 @@  config LEDS_ADP5520
 	  To compile this driver as a module, choose M here: the module will
 	  be called leds-adp5520.
 
-config LEDS_DELL_NETBOOKS
-	tristate "External LED on Dell Business Netbooks"
-	depends on LEDS_CLASS
-	depends on X86 && ACPI_WMI
-	help
-	  This adds support for the Latitude 2100 and similar
-	  notebooks that have an external LED.
-
 config LEDS_MC13783
 	tristate "LED Support for MC13XXX PMIC"
 	depends on LEDS_CLASS
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index 6b8273736478..558d24675454 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -52,7 +52,6 @@  obj-$(CONFIG_LEDS_REGULATOR)		+= leds-regulator.o
 obj-$(CONFIG_LEDS_INTEL_SS4200)		+= leds-ss4200.o
 obj-$(CONFIG_LEDS_LT3593)		+= leds-lt3593.o
 obj-$(CONFIG_LEDS_ADP5520)		+= leds-adp5520.o
-obj-$(CONFIG_LEDS_DELL_NETBOOKS)	+= dell-led.o
 obj-$(CONFIG_LEDS_MC13783)		+= leds-mc13783.o
 obj-$(CONFIG_LEDS_NS2)			+= leds-ns2.o
 obj-$(CONFIG_LEDS_NETXBIG)		+= leds-netxbig.o
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 81b8dcca8891..f9018e8c1e49 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -143,6 +143,14 @@  config DELL_WMI_AIO
 	  To compile this driver as a module, choose M here: the module will
 	  be called dell-wmi-aio.
 
+config DELL_WMI_LED
+	tristate "External LED on Dell Business Netbooks"
+	depends on LEDS_CLASS
+	depends on ACPI_WMI
+	help
+	  This adds support for the Latitude 2100 and similar
+	  notebooks that have an external LED.
+
 config DELL_SMO8800
 	tristate "Dell Latitude freefall driver (ACPI SMO88XX)"
 	depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 2efa86d2a1a7..b061817ecaf1 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -15,6 +15,7 @@  obj-$(CONFIG_DELL_SMBIOS)	+= dell-smbios.o
 obj-$(CONFIG_DELL_LAPTOP)	+= dell-laptop.o
 obj-$(CONFIG_DELL_WMI)		+= dell-wmi.o
 obj-$(CONFIG_DELL_WMI_AIO)	+= dell-wmi-aio.o
+obj-$(CONFIG_DELL_WMI_LED)	+= dell-wmi-led.o
 obj-$(CONFIG_DELL_SMO8800)	+= dell-smo8800.o
 obj-$(CONFIG_DELL_RBTN)		+= dell-rbtn.o
 obj-$(CONFIG_ACER_WMI)		+= acer-wmi.o
diff --git a/drivers/leds/dell-led.c b/drivers/platform/x86/dell-wmi-led.c
similarity index 99%
rename from drivers/leds/dell-led.c
rename to drivers/platform/x86/dell-wmi-led.c
index e5c57389efd6..d0232c7f1909 100644
--- a/drivers/leds/dell-led.c
+++ b/drivers/platform/x86/dell-wmi-led.c
@@ -1,6 +1,4 @@ 
 /*
- * dell_led.c - Dell LED Driver
- *
  * Copyright (C) 2010 Dell Inc.
  * Louis Davis <louis_davis@dell.com>
  * Jim Dailey <jim_dailey@dell.com>