platform/x86: Rename wmaa-backlight-wmi to nvidia-wmi-ec-backlight

Rename the wmaa-backlight-wmi driver and associated KConfig option to
remove the remaining references to the "WMAA" ACPI handle which was
used in the previous name. The driver has already been updated to
remove internal references to "WMAA". As part of the renaming, the
components in the name have been rearranged to reflect the standard
vendor_wmi_feature pattern.

Signed-off-by: Daniel Dadap <ddadap@nvidia.com>
Link: https://lore.kernel.org/r/20210927202359.13684-2-ddadap@nvidia.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index db81865..7041c65 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13389,6 +13389,12 @@ S:     Maintained
 F:     drivers/video/fbdev/nvidia/
 F:     drivers/video/fbdev/riva/
 
+NVIDIA WMI EC BACKLIGHT DRIVER
+M:     Daniel Dadap <ddadap@nvidia.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Supported
+F:     drivers/platform/x86/nvidia-wmi-ec-backlight.c
+
 NVM EXPRESS DRIVER
 M:     Keith Busch <kbusch@kernel.org>
 M:     Jens Axboe <axboe@fb.com>
@@ -20252,12 +20258,6 @@ L:     linux-wireless@vger.kernel.org
 S:     Odd fixes
 F:     drivers/net/wireless/wl3501*
 
-WMAA BACKLIGHT DRIVER
-M:     Daniel Dadap <ddadap@nvidia.com>
-L:     platform-driver-x86@vger.kernel.org
-S:     Supported
-F:     drivers/platform/x86/wmaa-backlight-wmi.c
-
 WOLFSON MICROELECTRONICS DRIVERS
 L:     patches@opensource.cirrus.com
 S:     Supported

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index f3dbb02..520da0a 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -91,21 +91,20 @@ config PEAQ_WMI
        help
         Say Y here if you want to support WMI-based hotkeys on PEAQ 2-in-1s.
 
-config WMAA_BACKLIGHT_WMI
-       tristate "ACPI WMAA Backlight Driver"
+config NVIDIA_WMI_EC_BACKLIGHT
+       tristate "EC Backlight Driver for Hybrid Graphics Notebook Systems"
        depends on ACPI_WMI
        depends on BACKLIGHT_CLASS_DEVICE
        help
-         This driver provides a sysfs backlight interface for notebook
-         systems which expose the WMAA ACPI method and an associated WMI
-         wrapper to drive LCD backlight levels through the Embedded Controller
-         (EC).
+         This driver provides a sysfs backlight interface for notebook systems
+         which are equipped with NVIDIA hybrid graphics and drive LCD backlight
+         levels through the Embedded Controller (EC).
 
          Say Y or M here if you want to control the backlight on a notebook
-         system with an EC-driven backlight using the ACPI WMAA method.
+         system with an EC-driven backlight.
 
          If you choose to compile this driver as a module the module will be
-         called wmaa-backlight-wmi.
+         called nvidia-wmi-ec-backlight.
 
 config XIAOMI_WMI
        tristate "Xiaomi WMI key driver"

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index edde481..0d046ed 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -11,8 +11,8 @@ obj-$(CONFIG_WMI_BMOF)                += wmi-bmof.o
 # WMI drivers
 obj-$(CONFIG_HUAWEI_WMI)               += huawei-wmi.o
 obj-$(CONFIG_MXM_WMI)                  += mxm-wmi.o
+obj-$(CONFIG_NVIDIA_WMI_EC_BACKLIGHT)  += nvidia-wmi-ec-backlight.o
 obj-$(CONFIG_PEAQ_WMI)                 += peaq-wmi.o
-obj-$(CONFIG_WMAA_BACKLIGHT_WMI)       += wmaa-backlight-wmi.o
 obj-$(CONFIG_XIAOMI_WMI)               += xiaomi-wmi.o
 obj-$(CONFIG_GIGABYTE_WMI)             += gigabyte-wmi.o
 

diff --git a/drivers/platform/x86/wmaa-backlight-wmi.c b/drivers/platform/x86/nvidia-wmi-ec-backlight.c
similarity index 100%
rename from drivers/platform/x86/wmaa-backlight-wmi.c
rename to drivers/platform/x86/nvidia-wmi-ec-backlight.c