watchdog: nic7018_wdt: tidy up ACPI ID table
PATCH v2 1/1 watchdog: nic7018_wdt: tidy up ACPI ID table
Tidy up ACPI ID table:
- drop ACPI_PTR() and hence replace acpi.h with mod_devicetable.h
- remove explicit driver_data initializer
- drop comma in the terminator entry
With that done, extend compile test coverage.
Signed-off-by Andy Shevchenko <[email protected]>
---
v2: fixed the dependency to be on HAS_IOPORT (LKP)
drivers/watchdog/Kconfig | 3 ++- drivers/watchdog/nic7018_wdt.c | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/watchdog/Kconfig +2 -1
@@ -1730,7 +1730,8 @@ config NI903X_WDT config NIC7018_WDT tristate "NIC7018 Watchdog" - depends on X86 && ACPI + depends on HAS_IOPORT + depends on ACPI || COMPILE_TEST select WATCHDOG_CORE help Support for National Instruments NIC7018 Watchdog.
drivers/watchdog/nic7018_wdt.c +5 -4
@@ -3,12 +3,13 @@* Copyright (C) 2016 National Instruments Corp. */ -#include <linux/acpi.h> #include <linux/bitops.h> #include <linux/device.h> #include <linux/io.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/types.h> #include <linux/watchdog.h> #define LOCK 0xA5
@@ -229,8 +230,8 @@ static void nic7018_remove(struct platform_device *pdev) }static const struct acpi_device_id nic7018_device_ids[] = { - {"NIC7018" ,0 }, - {"" ,0 }, + {"NIC7018" }, + { } };MODULE_DEVICE_TABLE (acpi, nic7018_device_ids);
@@ -239,7 +240,7 @@ static struct platform_driver watchdog_driver = { .remove = nic7018_remove, .driver = { .name = KBUILD_MODNAME, - .acpi_match_table = ACPI_PTR(nic7018_device_ids), + .acpi_match_table = nic7018_device_ids, }, };
Signature · 1 line
2.47.2
Quoted 8 lines · Andy Shevchenko
Tidy up ACPI ID table:
- dropACPI_PTR()and hence replaceacpi.hwithmod_devicetable.h
- remove explicitdriver_datainitializer
- drop comma in the terminator entryWith that done, extend compile test coverage.
Signed-off-by Andy Shevchenko <[email protected]>
Reviewed-by Guenter Roeck <[email protected]>