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 - used a named initializer for the acpi_device_id::id field to increase readability and drop explicitly setting the list terminator fields. Signed-off-by: Pawel Zalewski (The Capable Hub) <[email protected]> --- drivers/acpi/dptf/dptf_pch_fivr.c | 14 +++++++------- drivers/acpi/dptf/dptf_power.c | 38 +++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/acpi/dptf/dptf_pch_fivr.c b/drivers/acpi/dptf/dptf_pch_fivr.c index 8d7e555929d3..d23867f70b28 100644 --- a/drivers/acpi/dptf/dptf_pch_fivr.c +++ b/drivers/acpi/dptf/dptf_pch_fivr.c @@ -147,13 +147,13 @@ static void pch_fivr_remove(struct platform_device *pdev) } static const struct acpi_device_id pch_fivr_device_ids[] = { - {"INTC1045", 0}, - {"INTC1049", 0}, - {"INTC1064", 0}, - {"INTC106B", 0}, - {"INTC10A3", 0}, - {"INTC10D7", 0}, - {"", 0}, + { .id = "INTC1045" }, + { .id = "INTC1049" }, + { .id = "INTC1064" }, + { .id = "INTC106B" }, + { .id = "INTC10A3" }, + { .id = "INTC10D7" }, + { } }; MODULE_DEVICE_TABLE(acpi, pch_fivr_device_ids); diff --git a/drivers/acpi/dptf/dptf_power.c b/drivers/acpi/dptf/dptf_power.c index 55ccbb8ddbe3..065831bce8c0 100644 --- a/drivers/acpi/dptf/dptf_power.c +++ b/drivers/acpi/dptf/dptf_power.c @@ -224,25 +224,25 @@ static void dptf_power_remove(struct platform_device *pdev) } static const struct acpi_device_id int3407_device_ids[] = { - {"INT3407", 0}, - {"INT3532", 0}, - {"INTC1047", 0}, - {"INTC1050", 0}, - {"INTC1060", 0}, - {"INTC1061", 0}, - {"INTC1065", 0}, - {"INTC1066", 0}, - {"INTC106C", 0}, - {"INTC106D", 0}, - {"INTC10A4", 0}, - {"INTC10A5", 0}, - {"INTC10D8", 0}, - {"INTC10D9", 0}, - {"INTC1100", 0}, - {"INTC1101", 0}, - {"INTC10F7", 0}, - {"INTC10F8", 0}, - {"", 0}, + { .id = "INT3407" }, + { .id = "INT3532" }, + { .id = "INTC1047" }, + { .id = "INTC1050" }, + { .id = "INTC1060" }, + { .id = "INTC1061" }, + { .id = "INTC1065" }, + { .id = "INTC1066" }, + { .id = "INTC106C" }, + { .id = "INTC106D" }, + { .id = "INTC10A4" }, + { .id = "INTC10A5" }, + { .id = "INTC10D8" }, + { .id = "INTC10D9" }, + { .id = "INTC1100" }, + { .id = "INTC1101" }, + { .id = "INTC10F7" }, + { .id = "INTC10F8" }, + { } }; MODULE_DEVICE_TABLE(acpi, int3407_device_ids); -- 2.43.0
