These modules set the acpi_device_id::driver_data to 0 but the field is not actually used within the module, we can just drop it from the table.
While we are at it - use a named initializer for the acpi_device_id fields and drop setting the list terminator fields explicitly as well. Signed-off-by: Pawel Zalewski (The Capable Hub) <[email protected]> --- drivers/acpi/ac.c | 4 ++-- drivers/acpi/acpi_memhotplug.c | 4 ++-- drivers/acpi/acpi_pad.c | 4 ++-- drivers/acpi/acpi_tad.c | 4 ++-- drivers/acpi/battery.c | 8 +++----- drivers/acpi/container.c | 8 ++++---- drivers/acpi/ec.c | 6 +++--- drivers/acpi/hed.c | 4 ++-- drivers/acpi/processor_driver.c | 6 +++--- drivers/acpi/sbs.c | 4 ++-- drivers/acpi/sbshc.c | 6 +++--- drivers/acpi/thermal.c | 4 ++-- drivers/acpi/tiny-power-button.c | 6 +++--- drivers/acpi/video_detect.c | 4 ++-- 14 files changed, 35 insertions(+), 37 deletions(-) diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index f19d6dd43473..d6f162fe7ea4 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c @@ -32,8 +32,8 @@ MODULE_DESCRIPTION("ACPI AC Adapter Driver"); MODULE_LICENSE("GPL"); static const struct acpi_device_id ac_device_ids[] = { - {"ACPI0003", 0}, - {"", 0}, + {.id = "ACPI0003" }, + { } }; MODULE_DEVICE_TABLE(acpi, ac_device_ids); diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 1d7dfe4ee9a6..cf27765ed4d7 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c @@ -21,8 +21,8 @@ #define ACPI_MEMORY_DEVICE_HID "PNP0C80" static const struct acpi_device_id memory_device_ids[] = { - {ACPI_MEMORY_DEVICE_HID, 0}, - {"", 0}, + { .id = ACPI_MEMORY_DEVICE_HID }, + { } }; #ifdef CONFIG_ACPI_HOTPLUG_MEMORY diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c index dc6d0091d17c..9af3b8bce686 100644 --- a/drivers/acpi/acpi_pad.c +++ b/drivers/acpi/acpi_pad.c @@ -438,8 +438,8 @@ static void acpi_pad_remove(struct platform_device *pdev) } static const struct acpi_device_id pad_device_ids[] = { - {"ACPI000C", 0}, - {"", 0}, + { .id = "ACPI000C" }, + { } }; MODULE_DEVICE_TABLE(acpi, pad_device_ids); diff --git a/drivers/acpi/acpi_tad.c b/drivers/acpi/acpi_tad.c index fc43df083738..7a2a5167e8ec 100644 --- a/drivers/acpi/acpi_tad.c +++ b/drivers/acpi/acpi_tad.c @@ -885,8 +885,8 @@ static int acpi_tad_probe(struct platform_device *pdev) } static const struct acpi_device_id acpi_tad_ids[] = { - {"ACPI000E", 0}, - {} + { .id = "ACPI000E" }, + { } }; static struct platform_driver acpi_tad_driver = { diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index f5e0eb299610..30b42967e625 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -56,12 +56,10 @@ module_param(cache_time, uint, 0644); MODULE_PARM_DESC(cache_time, "cache time in milliseconds"); static const struct acpi_device_id battery_device_ids[] = { - {"PNP0C0A", 0}, - + { .id = "PNP0C0A"}, /* Microsoft Surface Go 3 */ - {"MSHW0146", 0}, - - {"", 0}, + { .id = "MSHW0146"}, + { } }; MODULE_DEVICE_TABLE(acpi, battery_device_ids); diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index f138a433554a..9997915233e1 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c @@ -15,10 +15,10 @@ #include "internal.h" static const struct acpi_device_id container_device_ids[] = { - {"ACPI0004", 0}, - {"PNP0A05", 0}, - {"PNP0A06", 0}, - {"", 0}, + { .id = "ACPI0004" }, + { .id = "PNP0A05" }, + { .id = "PNP0A06" }, + { } }; #ifdef CONFIG_ACPI_CONTAINER diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 64ad4cfa6208..fd62a455db2a 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -1794,9 +1794,9 @@ ec_parse_io_ports(struct acpi_resource *resource, void *context) } static const struct acpi_device_id ec_device_ids[] = { - {"PNP0C09", 0}, - {ACPI_ECDT_HID, 0}, - {"", 0}, + { .id = "PNP0C09" }, + { .id = ACPI_ECDT_HID }, + { } }; /* diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c index 48562f53d3ab..6789ec567d21 100644 --- a/drivers/acpi/hed.c +++ b/drivers/acpi/hed.c @@ -17,8 +17,8 @@ #include <acpi/hed.h> static const struct acpi_device_id acpi_hed_ids[] = { - {"PNP0C33", 0}, - {"", 0}, + { .id = "PNP0C33" }, + { } }; MODULE_DEVICE_TABLE(acpi, acpi_hed_ids); diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index cda8fd720000..c11cd0e3367f 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c @@ -36,9 +36,9 @@ MODULE_LICENSE("GPL"); static int acpi_processor_stop(struct device *dev); static const struct acpi_device_id processor_device_ids[] = { - {ACPI_PROCESSOR_OBJECT_HID, 0}, - {ACPI_PROCESSOR_DEVICE_HID, 0}, - {"", 0}, + { .id = ACPI_PROCESSOR_OBJECT_HID }, + { .id = ACPI_PROCESSOR_DEVICE_HID }, + { } }; MODULE_DEVICE_TABLE(acpi, processor_device_ids); diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index 86b7c7975852..354304c2c307 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c @@ -45,8 +45,8 @@ MODULE_PARM_DESC(cache_time, "cache time in milliseconds"); #define ACPI_SBS_BLOCK_MAX 32 static const struct acpi_device_id sbs_device_ids[] = { - {"ACPI0002", 0}, - {"", 0}, + { .id = "ACPI0002" }, + { } }; MODULE_DEVICE_TABLE(acpi, sbs_device_ids); diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c index c0ffa267f96c..ac628212c048 100644 --- a/drivers/acpi/sbshc.c +++ b/drivers/acpi/sbshc.c @@ -33,9 +33,9 @@ static int acpi_smbus_hc_probe(struct platform_device *pdev); static void acpi_smbus_hc_remove(struct platform_device *pdev); static const struct acpi_device_id sbs_device_ids[] = { - {"ACPI0001", 0}, - {"ACPI0005", 0}, - {"", 0}, + { .id = "ACPI0001" }, + { .id = "ACPI0005" }, + { } }; MODULE_DEVICE_TABLE(acpi, sbs_device_ids); diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index dd7666c176a0..189011733956 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -920,8 +920,8 @@ static const struct dev_pm_ops acpi_thermal_pm_ops = { #endif /* CONFIG_PM_SLEEP */ static const struct acpi_device_id thermal_device_ids[] = { - {ACPI_THERMAL_HID, 0}, - {"", 0}, + { .id = ACPI_THERMAL_HID }, + { } }; MODULE_DEVICE_TABLE(acpi, thermal_device_ids); diff --git a/drivers/acpi/tiny-power-button.c b/drivers/acpi/tiny-power-button.c index 92516ef84b02..5acb53090ff3 100644 --- a/drivers/acpi/tiny-power-button.c +++ b/drivers/acpi/tiny-power-button.c @@ -14,9 +14,9 @@ module_param(power_signal, int, 0644); MODULE_PARM_DESC(power_signal, "Power button sends this signal to init"); static const struct acpi_device_id tiny_power_button_device_ids[] = { - { ACPI_BUTTON_HID_POWER, 0 }, - { ACPI_BUTTON_HID_POWERF, 0 }, - { "", 0 }, + { .id = ACPI_BUTTON_HID_POWER }, + { .id = ACPI_BUTTON_HID_POWERF }, + { } }; MODULE_DEVICE_TABLE(acpi, tiny_power_button_device_ids); diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c index 458efa4fe9d4..e135f29d4093 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c @@ -68,8 +68,8 @@ find_video(acpi_handle handle, u32 lvl, void *context, void **rv) struct pci_dev *dev; static const struct acpi_device_id video_ids[] = { - {ACPI_VIDEO_HID, 0}, - {"", 0}, + { .id = ACPI_VIDEO_HID }, + { } }; if (acpi_dev && !acpi_match_device_ids(acpi_dev, video_ids)) { -- 2.43.0
