From: "Uwe Kleine-König (The Capable Hub)" <u.kleine-koenig@baylibre.com>
To: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Len Brown <lenb@kernel.org>, Bjorn Helgaas <bhelgaas@google.com>,
Andy Shevchenko <andy@kernel.org>,
Mika Westerberg <westeri@kernel.org>,
Zhang Rui <rui.zhang@intel.com>,
Chu Guangqing <chuguangqing@inspur.com>,
Pawel Zalewski <pzalewski@thegoodpenguin.co.uk>,
Yauhen Kharuzhy <jekhor@gmail.com>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-pci@vger.kernel.org
Subject: [PATCH v1 4/4] ACPI: Unify *_device_id list terminators
Date: Fri, 13 Nov 2026 12:14:00 +0100 [thread overview]
Message-ID: <68abd7c74b17f3ff08bd825b08b99d7b77ca76ac.1794567577.git.ukleinek@kernel.org> (raw)
In-Reply-To: <cover.1794567577.git.ukleinek@kernel.org>
Consistenly use a single space and no trailing , for the list
terminator. This doesn't introduce any changes to the compiled result of
the modified drivers and just aligns these to the common style of the
other device_id arrays.
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/acpi/ac.c | 2 +-
drivers/acpi/acpi_video.c | 4 ++--
drivers/acpi/battery.c | 2 +-
drivers/acpi/bus.c | 2 +-
drivers/acpi/button.c | 2 +-
drivers/acpi/ec.c | 2 +-
drivers/acpi/mipi-disco-img.c | 2 +-
drivers/acpi/osi.c | 2 +-
drivers/acpi/pci_slot.c | 2 +-
drivers/acpi/pmic/intel_pmic_bxtwc.c | 2 +-
drivers/acpi/pmic/intel_pmic_chtdc_ti.c | 2 +-
drivers/acpi/pmic/intel_pmic_chtwc.c | 2 +-
drivers/acpi/power.c | 2 +-
drivers/acpi/processor_idle.c | 2 +-
drivers/acpi/sleep.c | 2 +-
drivers/acpi/thermal.c | 2 +-
drivers/acpi/video_detect.c | 2 +-
drivers/acpi/x86/blacklist.c | 2 +-
drivers/acpi/x86/lpss.c | 4 ++--
drivers/acpi/x86/utils.c | 4 ++--
20 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 168e1d495b7b..85f1c54c9378 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -187,7 +187,7 @@ static const struct dmi_system_id ac_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "32597CG"),
},
},
- {},
+ { }
};
static int acpi_ac_probe(struct platform_device *pdev)
diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index 2a2822516665..548303bb3a14 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -92,7 +92,7 @@ enum acpi_video_level_idx {
static const struct auxiliary_device_id video_bus_auxiliary_id_table[] = {
{ .name = "acpi.video_bus" },
- {},
+ { }
};
MODULE_DEVICE_TABLE(auxiliary, video_bus_auxiliary_id_table);
@@ -518,7 +518,7 @@ static const struct dmi_system_id video_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "EasyNote MZ35"),
},
},
- {}
+ { }
};
static unsigned long long
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 8b1b66cf5369..c1f36e6dfab4 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -1387,7 +1387,7 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "Surface Go 3"),
},
},
- {},
+ { }
};
static void acpi_battery_wakeup_cleanup(void *data)
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 1d6867dec925..3cf1719b5246 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -66,7 +66,7 @@ static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "Satellite"),
},
},
- {}
+ { }
};
#endif
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 66a57eea2280..c41fba556030 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -167,7 +167,7 @@ static const struct dmi_system_id dmi_lid_quirks[] = {
},
.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_OPEN,
},
- {}
+ { }
};
static int acpi_button_probe(struct platform_device *pdev);
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index d947118657a8..da7f35a42dd4 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -2017,7 +2017,7 @@ static const struct dmi_system_id ec_dmi_table[] __initconst = {
DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
},
},
- {}
+ { }
};
void __init acpi_ec_ecdt_probe(void)
diff --git a/drivers/acpi/mipi-disco-img.c b/drivers/acpi/mipi-disco-img.c
index ea4bffe3c02d..86df7dc25339 100644
--- a/drivers/acpi/mipi-disco-img.c
+++ b/drivers/acpi/mipi-disco-img.c
@@ -736,7 +736,7 @@ static const struct x86_cpu_id dell_broken_mipi_disco_cpu_gens[] = {
X86_MATCH_VFM(INTEL_RAPTORLAKE, NULL),
X86_MATCH_VFM(INTEL_RAPTORLAKE_P, NULL),
X86_MATCH_VFM(INTEL_RAPTORLAKE_S, NULL),
- {}
+ { }
};
static const char *strnext(const char *s1, const char *s2)
diff --git a/drivers/acpi/osi.c b/drivers/acpi/osi.c
index 9470f1830ff5..0fcb0d006065 100644
--- a/drivers/acpi/osi.c
+++ b/drivers/acpi/osi.c
@@ -473,7 +473,7 @@ static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "1015PX"),
},
},
- {}
+ { }
};
static __init void acpi_osi_dmi_blacklisted(void)
diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
index 33a123074071..e5cf81b6c8e1 100644
--- a/drivers/acpi/pci_slot.c
+++ b/drivers/acpi/pci_slot.c
@@ -178,7 +178,7 @@ static const struct dmi_system_id acpi_pci_slot_dmi_table[] __initconst = {
DMI_MATCH(DMI_BIOS_VERSION, "PRIMEQUEST"),
},
},
- {}
+ { }
};
void __init acpi_pci_slot_init(void)
diff --git a/drivers/acpi/pmic/intel_pmic_bxtwc.c b/drivers/acpi/pmic/intel_pmic_bxtwc.c
index c332afbf82bd..99c05b62df43 100644
--- a/drivers/acpi/pmic/intel_pmic_bxtwc.c
+++ b/drivers/acpi/pmic/intel_pmic_bxtwc.c
@@ -395,7 +395,7 @@ static int intel_bxtwc_pmic_opregion_probe(struct platform_device *pdev)
static const struct platform_device_id bxt_wc_opregion_id_table[] = {
{ .name = "bxt_wcove_region" },
- {},
+ { }
};
static struct platform_driver intel_bxtwc_pmic_opregion_driver = {
diff --git a/drivers/acpi/pmic/intel_pmic_chtdc_ti.c b/drivers/acpi/pmic/intel_pmic_chtdc_ti.c
index ecb36fbc1e7f..5424cf72fb1b 100644
--- a/drivers/acpi/pmic/intel_pmic_chtdc_ti.c
+++ b/drivers/acpi/pmic/intel_pmic_chtdc_ti.c
@@ -127,7 +127,7 @@ static int chtdc_ti_pmic_opregion_probe(struct platform_device *pdev)
static const struct platform_device_id chtdc_ti_pmic_opregion_id_table[] = {
{ .name = "chtdc_ti_region" },
- {},
+ { }
};
static struct platform_driver chtdc_ti_pmic_opregion_driver = {
diff --git a/drivers/acpi/pmic/intel_pmic_chtwc.c b/drivers/acpi/pmic/intel_pmic_chtwc.c
index 81caede51ca2..f4c90907b020 100644
--- a/drivers/acpi/pmic/intel_pmic_chtwc.c
+++ b/drivers/acpi/pmic/intel_pmic_chtwc.c
@@ -275,7 +275,7 @@ static int intel_cht_wc_pmic_opregion_probe(struct platform_device *pdev)
static const struct platform_device_id cht_wc_opregion_id_table[] = {
{ .name = "cht_wcove_region" },
- {},
+ { }
};
static struct platform_driver intel_cht_wc_pmic_opregion_driver = {
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index c77342a584f0..e97eb73bb2fe 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -1093,7 +1093,7 @@ static const struct dmi_system_id dmi_hp_elitebook_gp12pxp_quirk[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook 855 G7 Notebook PC"),
},
},
- {}
+ { }
};
static const struct dmi_system_id dmi_leave_unused_power_resources_on[] = {
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index e113bcbbb882..9238e12e37fd 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -105,7 +105,7 @@ static const struct dmi_system_id processor_power_dmi_table[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
(void *)1},
- {},
+ { }
};
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 641056e0252b..7c1fb5b844be 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -407,7 +407,7 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "20GGA00L00"),
},
},
- {},
+ { }
};
static bool ignore_blacklist;
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index da631bbe8ea2..3d06744924b6 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -1014,7 +1014,7 @@ static const struct dmi_system_id thermal_dmi_table[] __initconst = {
DMI_MATCH(DMI_BOARD_NAME, "7ZX"),
},
},
- {}
+ { }
};
static int __init acpi_thermal_init(void)
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 2050b8ff5384..997794d3b3d6 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -986,7 +986,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "Mipad2"),
},
},
- { },
+ { }
};
static bool google_cros_ec_present(void)
diff --git a/drivers/acpi/x86/blacklist.c b/drivers/acpi/x86/blacklist.c
index 55214d0a12b1..553291330f39 100644
--- a/drivers/acpi/x86/blacklist.c
+++ b/drivers/acpi/x86/blacklist.c
@@ -134,7 +134,7 @@ static const struct dmi_system_id acpi_rev_dmi_table[] __initconst = {
},
},
#endif
- {}
+ { }
};
#endif /* CONFIG_DMI */
diff --git a/drivers/acpi/x86/lpss.c b/drivers/acpi/x86/lpss.c
index 50b6db40bb18..fa0f1b61614d 100644
--- a/drivers/acpi/x86/lpss.c
+++ b/drivers/acpi/x86/lpss.c
@@ -340,7 +340,7 @@ static const struct lpss_device_desc bsw_spi_dev_desc = {
static const struct x86_cpu_id lpss_cpu_ids[] = {
X86_MATCH_VFM(INTEL_ATOM_SILVERMONT, NULL),
X86_MATCH_VFM(INTEL_ATOM_AIRMONT, NULL),
- {}
+ { }
};
#else
@@ -493,7 +493,7 @@ static const struct dmi_system_id i2c1_dep_missing_dmi_ids[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "T200TA"),
},
},
- {}
+ { }
};
/*
diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c
index e723575399b8..b6ef5dfb662a 100644
--- a/drivers/acpi/x86/utils.c
+++ b/drivers/acpi/x86/utils.c
@@ -49,7 +49,7 @@ struct override_status_id {
#define ENTRY(status, hid, uid, path, cpu_vfm, dmi...) { \
{ { .id = hid }, { } }, \
{ X86_MATCH_VFM(cpu_vfm, NULL), {} }, \
- { { .matches = dmi }, {} }, \
+ { { .matches = dmi }, { } }, \
uid, \
path, \
status, \
@@ -458,7 +458,7 @@ static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = {
ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY),
},
#endif
- {}
+ { }
};
#if IS_ENABLED(CONFIG_X86_ANDROID_TABLETS)
--
2.56.0.rc1
prev parent reply other threads:[~2026-11-13 11:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-13 11:13 [PATCH v1 0/4] ACPI: Use named initializers for acpi_device_id arrays Uwe Kleine-König (The Capable Hub)
2026-11-13 11:13 ` [PATCH v1 1/4] ACPI: Unify acpi_device_id list terminators Uwe Kleine-König (The Capable Hub)
2026-11-13 11:13 ` [PATCH v1 2/4] ACPI: Drop unused .driver_data initializers in acpi_device_id arrays Uwe Kleine-König (The Capable Hub)
2026-11-13 11:13 ` [PATCH v1 3/4] ACPI: Use named initializers for " Uwe Kleine-König (The Capable Hub)
2026-11-13 11:14 ` Uwe Kleine-König (The Capable Hub) [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=68abd7c74b17f3ff08bd825b08b99d7b77ca76ac.1794567577.git.ukleinek@kernel.org \
--to=u.kleine-koenig@baylibre.com \
--cc=andy@kernel.org \
--cc=bhelgaas@google.com \
--cc=chuguangqing@inspur.com \
--cc=jekhor@gmail.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=pzalewski@thegoodpenguin.co.uk \
--cc=rafael@kernel.org \
--cc=rui.zhang@intel.com \
--cc=westeri@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®