diff mbox

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

Message ID 20161208123618.28603-8-kernel@kempniu.pl (mailing list archive)
State New, archived
Headers show

Commit Message

Michał Kępień Dec. 8, 2016, 12:36 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 COFIG_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,

  - one comment line is updated to reflect the change in the name of the
    module's source file.

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, 10 insertions(+), 10 deletions(-)
 rename drivers/{leds/dell-led.c => platform/x86/dell-wmi-led.c} (99%)

Comments

Andy Shevchenko Dec. 14, 2016, 2:05 a.m. UTC | #1
On Thu, Dec 8, 2016 at 2:36 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 COFIG_LEDS_DELL_NETBOOKS to

Typo here, CONFIG_...

>     CONFIG_DELL_WMI_LED,

Do we care about current configuration or we just suggest users to
follow this by themselves?

>
>   - the X86 Kconfig dependency is removed as the whole
>     drivers/platform/x86 menu depends on it, so there is no need to
>     duplicate it,
>
>   - one comment line is updated to reflect the change in the name of the
>     module's source file.
>

While here, please follow our pattern for subject lines, i.e.
"platform/x86: driver: Description".

> 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, 10 insertions(+), 10 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 f29b869..5af3fb2 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 6b82737..558d246 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 81b8dcc..f9018e8 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 2efa86d..b061817 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 e5c5738..7486c01 100644
> --- a/drivers/leds/dell-led.c
> +++ b/drivers/platform/x86/dell-wmi-led.c
> @@ -1,5 +1,5 @@
>  /*

> - * dell_led.c - Dell LED Driver
> + * dell-wmi-led.c - Dell WMI LED Driver

That's exactly the point why better to take a chance to remove file
name from the file.

>   *
>   * Copyright (C) 2010 Dell Inc.
>   * Louis Davis <louis_davis@dell.com>
Michał Kępień Dec. 15, 2016, 2:54 p.m. UTC | #2
> On Thu, Dec 8, 2016 at 2:36 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 COFIG_LEDS_DELL_NETBOOKS to
> 
> Typo here, CONFIG_...

Indeed, thanks.

> >     CONFIG_DELL_WMI_LED,
> 
> Do we care about current configuration or we just suggest users to
> follow this by themselves?

I searched the git log for a bit, looking for ideas.  Every commit I
found that renames a Kconfig option settles for doing just that, without
any further provisions to make some kind of automatic transition happen.
That being said, if there is anything I can do to make it easier for the
user to notice this change, I would be happy to hear about it.

> >
> >   - the X86 Kconfig dependency is removed as the whole
> >     drivers/platform/x86 menu depends on it, so there is no need to
> >     duplicate it,
> >
> >   - one comment line is updated to reflect the change in the name of the
> >     module's source file.
> >
> 
> While here, please follow our pattern for subject lines, i.e.
> "platform/x86: driver: Description".

Ah, sure, thanks.  It seems this pattern has changed since the last time
I submitted a patch for drivers/platform/x86.

> > 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, 10 insertions(+), 10 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 f29b869..5af3fb2 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 6b82737..558d246 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 81b8dcc..f9018e8 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 2efa86d..b061817 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 e5c5738..7486c01 100644
> > --- a/drivers/leds/dell-led.c
> > +++ b/drivers/platform/x86/dell-wmi-led.c
> > @@ -1,5 +1,5 @@
> >  /*
> 
> > - * dell_led.c - Dell LED Driver
> > + * dell-wmi-led.c - Dell WMI LED Driver
> 
> That's exactly the point why better to take a chance to remove file
> name from the file.

I will be glad to rip it out in v2, thanks.
diff mbox

Patch

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index f29b869..5af3fb2 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 6b82737..558d246 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 81b8dcc..f9018e8 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 2efa86d..b061817 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 e5c5738..7486c01 100644
--- a/drivers/leds/dell-led.c
+++ b/drivers/platform/x86/dell-wmi-led.c
@@ -1,5 +1,5 @@ 
 /*
- * dell_led.c - Dell LED Driver
+ * dell-wmi-led.c - Dell WMI LED Driver
  *
  * Copyright (C) 2010 Dell Inc.
  * Louis Davis <louis_davis@dell.com>