[PATCH v1 1/1] leds: nic78bx: tidy up ACPI ID table

[PATCH v1 1/1] leds: nic78bx: tidy up ACPI ID table

[Andy Shevchenko]

Tidy up ACPI ID table:

- drop ACPI_PTR() and hence replace acpi.h with mod_devicetable.h and
  other necessary headers

- remove explicit driver_data initializer

- drop comma in the terminator entry

With that done, extend compile test coverage.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/leds/Kconfig        |  3 ++-
 drivers/leds/leds-nic78bx.c | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 8f59a7a01371..9df66462260a 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -920,7 +920,8 @@ config LEDS_USER
 config LEDS_NIC78BX
 	tristate "LED support for NI PXI NIC78bx devices"
 	depends on LEDS_CLASS
-	depends on X86 && ACPI
+	depends on HAS_IOPORT
+	depends on X86 || COMPILE_TEST
 	help
 	  This option enables support for the User1 and User2 LEDs on NI
 	  PXI NIC78bx devices.
diff --git a/drivers/leds/leds-nic78bx.c b/drivers/leds/leds-nic78bx.c
index 282d9e4cf116..f3161266b8ad 100644
--- a/drivers/leds/leds-nic78bx.c
+++ b/drivers/leds/leds-nic78bx.c
@@ -3,11 +3,19 @@
  * Copyright (C) 2016 National Instruments Corp.
  */
 
-#include <linux/acpi.h>
+#include <linux/array_size.h>
+#include <linux/bits.h>
+#include <linux/container_of.h>
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
 #include <linux/leds.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
+#include <linux/types.h>
 
 #define NIC78BX_USER1_LED_MASK		0x3
 #define NIC78BX_USER1_GREEN_LED		BIT(0)
@@ -181,8 +189,8 @@ static int nic78bx_probe(struct platform_device *pdev)
 }
 
 static const struct acpi_device_id led_device_ids[] = {
-	{"NIC78B3", 0},
-	{"", 0},
+	{ "NIC78B3" },
+	{ }
 };
 MODULE_DEVICE_TABLE(acpi, led_device_ids);
 
@@ -190,7 +198,7 @@ static struct platform_driver led_driver = {
 	.probe = nic78bx_probe,
 	.driver = {
 		.name = KBUILD_MODNAME,
-		.acpi_match_table = ACPI_PTR(led_device_ids),
+		.acpi_match_table = led_device_ids,
 	},
 };
 
-- 
2.47.2

Re: (subset) [PATCH v1 1/1] leds: nic78bx: tidy up ACPI ID table

[Lee Jones]

On Thu, 13 Mar 2025 18:16:30 +0200, Andy Shevchenko wrote:
> Tidy up ACPI ID table:
> 
> - drop ACPI_PTR() and hence replace acpi.h with mod_devicetable.h and
>   other necessary headers
> 
> - remove explicit driver_data initializer
> 
> [...]

Applied, thanks!

[1/1] leds: nic78bx: tidy up ACPI ID table
      commit: 161e3bea8fa5ba34b2291e5cfeb3e533cf991613

--
Lee Jones [李琼斯]