[OEM-5.14] [PATCH 3/4] platform/x86: Rename wmaa-backlight-wmi to nvidia-wmi-ec-backlight

[Kai-Heng Feng]

From: Daniel Dadap <ddadap at nvidia.com>

BugLink: https://bugs.launchpad.net/bugs/1953286

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 at nvidia.com>
Link: https://lore.kernel.org/r/20210927202359.13684-2-ddadap@nvidia.com
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
(backported from commit ca16d33bd86246bf91d089c8ba78b9b214574b12)
Signed-off-by: Kai-Heng Feng <kai.heng.feng at canonical.com>
---
 MAINTAINERS                                       | 12 ++++++------
 drivers/platform/x86/Kconfig                      | 15 +++++++--------
 drivers/platform/x86/Makefile                     |  2 +-
 ...-backlight-wmi.c => nvidia-wmi-ec-backlight.c} |  0
 4 files changed, 14 insertions(+), 15 deletions(-)
 rename drivers/platform/x86/{wmaa-backlight-wmi.c => nvidia-wmi-ec-backlight.c} (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 9d22d199d61a1..28464aac5adbb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13291,6 +13291,12 @@ S:	Maintained
 F:	drivers/video/fbdev/nvidia/
 F:	drivers/video/fbdev/riva/
 
+NVIDIA WMI EC BACKLIGHT DRIVER
+M:	Daniel Dadap <ddadap at nvidia.com>
+L:	platform-driver-x86 at vger.kernel.org
+S:	Supported
+F:	drivers/platform/x86/nvidia-wmi-ec-backlight.c
+
 NVM EXPRESS DRIVER
 M:	Keith Busch <kbusch at kernel.org>
 M:	Jens Axboe <axboe at fb.com>
@@ -20037,12 +20043,6 @@ L:	linux-wireless at vger.kernel.org
 S:	Odd fixes
 F:	drivers/net/wireless/wl3501*
 
-WMAA BACKLIGHT DRIVER
-M:	Daniel Dadap <ddadap at nvidia.com>
-L:	platform-driver-x86 at vger.kernel.org
-S:	Supported
-F:	drivers/platform/x86/wmaa-backlight-wmi.c
-
 WOLFSON MICROELECTRONICS DRIVERS
 L:	patches at opensource.cirrus.com
 S:	Supported
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 516b812a4fd79..952f224b5fc5e 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -113,21 +113,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 109c1714237dd..802c203b7619b 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -13,8 +13,8 @@ obj-$(CONFIG_HUAWEI_WMI)		+= huawei-wmi.o
 obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)	+= intel-wmi-sbl-fw-update.o
 obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)	+= intel-wmi-thunderbolt.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
-- 
2.32.0