Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <andriy.shevchenko@linux.intel.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20250304140114.1812452-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
This commit is contained in:
Andy Shevchenko 2025-03-04 15:45:35 +02:00 committed by Wim Van Sebroeck
parent 480ee8a260
commit f1c16aa612
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/watchdog/Kconfig
View File

@ -1743,7 +1743,8 @@ config NI903X_WDT
config NIC7018_WDT config NIC7018_WDT
tristate "NIC7018 Watchdog" tristate "NIC7018 Watchdog"
depends on X86 && ACPI depends on HAS_IOPORT
depends on ACPI || COMPILE_TEST
select WATCHDOG_CORE select WATCHDOG_CORE
help help
Support for National Instruments NIC7018 Watchdog. Support for National Instruments NIC7018 Watchdog.

9
drivers/watchdog/nic7018_wdt.c
View File

@ -3,12 +3,13 @@
* Copyright (C) 2016 National Instruments Corp. * Copyright (C) 2016 National Instruments Corp.
*/ */
#include <linux/acpi.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/io.h> #include <linux/io.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/types.h>
#include <linux/watchdog.h> #include <linux/watchdog.h>
#define LOCK 0xA5 #define LOCK 0xA5
@ -229,8 +230,8 @@ static void nic7018_remove(struct platform_device *pdev)
} }
static const struct acpi_device_id nic7018_device_ids[] = { static const struct acpi_device_id nic7018_device_ids[] = {
{"NIC7018", 0}, { "NIC7018" },
{"", 0}, { }
}; };
MODULE_DEVICE_TABLE(acpi, nic7018_device_ids); MODULE_DEVICE_TABLE(acpi, nic7018_device_ids);
@ -239,7 +240,7 @@ static struct platform_driver watchdog_driver = {
.remove = nic7018_remove, .remove = nic7018_remove,
.driver = { .driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.acpi_match_table = ACPI_PTR(nic7018_device_ids), .acpi_match_table = nic7018_device_ids,
}, },
}; };