public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

leds: nic78bx: Tidy up ACPI ID table

Browse source 
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>
Link: https://lore.kernel.org/r/20250313161630.415515-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
Andy Shevchenko 2025-03-13 18:16:30 +02:00 • committed by Lee Jones
parent 52fc80729b
commit 161e3bea8f
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/leds/Kconfig
View file

@ -924,7 +924,8 @@ config LEDS_USER
config LEDS_NIC78BX config LEDS_NIC78BX
tristate "LED support for NI PXI NIC78bx devices" tristate "LED support for NI PXI NIC78bx devices"
depends on LEDS_CLASS depends on LEDS_CLASS
depends on X86 && ACPI depends on HAS_IOPORT
depends on X86 || COMPILE_TEST
help help
This option enables support for the User1 and User2 LEDs on NI This option enables support for the User1 and User2 LEDs on NI
PXI NIC78bx devices. PXI NIC78bx devices.

16
drivers/leds/leds-nic78bx.c
View file

@ -3,11 +3,19 @@
* Copyright (C) 2016 National Instruments Corp. * 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/leds.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/types.h>
#define NIC78BX_USER1_LED_MASK 0x3 #define NIC78BX_USER1_LED_MASK 0x3
#define NIC78BX_USER1_GREEN_LED BIT(0) #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[] = { static const struct acpi_device_id led_device_ids[] = {
{"NIC78B3", 0}, { "NIC78B3" },
{"", 0}, { }
}; };
MODULE_DEVICE_TABLE(acpi, led_device_ids); MODULE_DEVICE_TABLE(acpi, led_device_ids);
@ -190,7 +198,7 @@ static struct platform_driver led_driver = {
.probe = nic78bx_probe, .probe = nic78bx_probe,
.driver = { .driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.acpi_match_table = ACPI_PTR(led_device_ids), .acpi_match_table = led_device_ids,
}, },
}; };