From 38f5659310d94a81d512caab85cbc04993b870eb Mon Sep 17 00:00:00 2001 From: Pawel Zalewski Date: Fri, 18 Sep 2026 14:01:51 +0100 Subject: [PATCH] i2c: busses: use named initializers for acpi_device_id Use a designated initializer for the acpi_device_id fields which makes the code more readable and consistent with how lists are initialized in the rest of the kernel code base. Also drop explicitly setting fields to 0 where it is redundant. Unify the list terminator to have a single space between the brackets and no trailing comma. Unify list item alignment to have a single space padding between the brackets. Signed-off-by: Pawel Zalewski Acked-by: Mika Westerberg Signed-off-by: Andi Shyti Link: https://patch.msgid.link/20260918-acpi-i2c-v1-2-caf4bea4886c@thegoodpenguin.co.uk --- drivers/i2c/busses/i2c-amd-asf-plat.c | 2 +- drivers/i2c/busses/i2c-amd-mp2-plat.c | 2 +- drivers/i2c/busses/i2c-cros-ec-tunnel.c | 2 +- drivers/i2c/busses/i2c-designware-platdrv.c | 42 ++++++++++----------- drivers/i2c/busses/i2c-gpio.c | 2 +- drivers/i2c/busses/i2c-hisi.c | 2 +- drivers/i2c/busses/i2c-imx.c | 2 +- drivers/i2c/busses/i2c-ls2x.c | 2 +- drivers/i2c/busses/i2c-mlxbf.c | 8 ++-- drivers/i2c/busses/i2c-qcom-geni.c | 4 +- drivers/i2c/busses/i2c-qup.c | 2 +- drivers/i2c/busses/i2c-scmi.c | 8 ++-- drivers/i2c/busses/i2c-synquacer.c | 4 +- drivers/i2c/busses/i2c-tegra.c | 8 ++-- drivers/i2c/busses/i2c-usbio.c | 12 +++--- drivers/i2c/busses/i2c-viai2c-zhaoxin.c | 2 +- drivers/i2c/busses/i2c-xgene-slimpro.c | 6 +-- drivers/i2c/busses/i2c-xlp9xx.c | 6 +-- 18 files changed, 58 insertions(+), 58 deletions(-) diff --git a/drivers/i2c/busses/i2c-amd-asf-plat.c b/drivers/i2c/busses/i2c-amd-asf-plat.c index b0b40fe1d79b..2a5711411ee5 100644 --- a/drivers/i2c/busses/i2c-amd-asf-plat.c +++ b/drivers/i2c/busses/i2c-amd-asf-plat.c @@ -354,7 +354,7 @@ static int amd_asf_probe(struct platform_device *pdev) } static const struct acpi_device_id amd_asf_acpi_ids[] = { - { "AMDI001A" }, + { .id = "AMDI001A" }, { } }; MODULE_DEVICE_TABLE(acpi, amd_asf_acpi_ids); diff --git a/drivers/i2c/busses/i2c-amd-mp2-plat.c b/drivers/i2c/busses/i2c-amd-mp2-plat.c index 9fdd6a5fb8b6..cc5961364bcc 100644 --- a/drivers/i2c/busses/i2c-amd-mp2-plat.c +++ b/drivers/i2c/busses/i2c-amd-mp2-plat.c @@ -341,7 +341,7 @@ static void i2c_amd_remove(struct platform_device *pdev) } static const struct acpi_device_id i2c_amd_acpi_match[] = { - { "AMDI0011" }, + { .id = "AMDI0011" }, { } }; MODULE_DEVICE_TABLE(acpi, i2c_amd_acpi_match); diff --git a/drivers/i2c/busses/i2c-cros-ec-tunnel.c b/drivers/i2c/busses/i2c-cros-ec-tunnel.c index 208ce4f9e782..a83e735d2086 100644 --- a/drivers/i2c/busses/i2c-cros-ec-tunnel.c +++ b/drivers/i2c/busses/i2c-cros-ec-tunnel.c @@ -300,7 +300,7 @@ static const struct of_device_id cros_ec_i2c_of_match[] __maybe_unused = { MODULE_DEVICE_TABLE(of, cros_ec_i2c_of_match); static const struct acpi_device_id cros_ec_i2c_tunnel_acpi_id[] __maybe_unused = { - { "GOOG0012", 0 }, + { .id = "GOOG0012" }, { } }; MODULE_DEVICE_TABLE(acpi, cros_ec_i2c_tunnel_acpi_id); diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 447af5523c2e..1da6b0314b6a 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -260,27 +260,27 @@ static const struct of_device_id dw_i2c_of_match[] = { MODULE_DEVICE_TABLE(of, dw_i2c_of_match); static const struct acpi_device_id dw_i2c_acpi_match[] = { - { "80860F41", ACCESS_NO_IRQ_SUSPEND }, - { "808622C1", ACCESS_NO_IRQ_SUSPEND }, - { "AMD0010", ACCESS_INTR_MASK }, - { "AMDI0010", ACCESS_INTR_MASK }, - { "AMDI0019", ACCESS_INTR_MASK | ARBITRATION_SEMAPHORE }, - { "AMDI0510", 0 }, - { "APMC0D0F", 0 }, - { "FUJI200B", 0 }, - { "GOOG5000", 0 }, - { "HISI02A1", 0 }, - { "HISI02A2", 0 }, - { "HISI02A3", 0 }, - { "HJMC3001", ACCESS_INTR_MASK }, - { "HYGO0010", ACCESS_INTR_MASK }, - { "INT33C2", 0 }, - { "INT33C3", 0 }, - { "INT3432", 0 }, - { "INT3433", 0 }, - { "INTC10EF", 0 }, - { "LECA0003", 0 }, - {} + { .id = "80860F41", .driver_data = ACCESS_NO_IRQ_SUSPEND }, + { .id = "808622C1", .driver_data = ACCESS_NO_IRQ_SUSPEND }, + { .id = "AMD0010", .driver_data = ACCESS_INTR_MASK }, + { .id = "AMDI0010", .driver_data = ACCESS_INTR_MASK }, + { .id = "AMDI0019", .driver_data = ACCESS_INTR_MASK | ARBITRATION_SEMAPHORE }, + { .id = "AMDI0510" }, + { .id = "APMC0D0F" }, + { .id = "FUJI200B" }, + { .id = "GOOG5000" }, + { .id = "HISI02A1" }, + { .id = "HISI02A2" }, + { .id = "HISI02A3" }, + { .id = "HJMC3001", .driver_data = ACCESS_INTR_MASK }, + { .id = "HYGO0010", .driver_data = ACCESS_INTR_MASK }, + { .id = "INT33C2" }, + { .id = "INT33C3" }, + { .id = "INT3432" }, + { .id = "INT3433" }, + { .id = "INTC10EF" }, + { .id = "LECA0003" }, + { } }; MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match); diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c index b7521b7ece37..9c08d7bce937 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c @@ -664,7 +664,7 @@ static const struct of_device_id i2c_gpio_dt_ids[] = { MODULE_DEVICE_TABLE(of, i2c_gpio_dt_ids); static const struct acpi_device_id i2c_gpio_acpi_match[] = { - { "LOON0005" }, /* LoongArch */ + { .id = "LOON0005" }, /* LoongArch */ { } }; MODULE_DEVICE_TABLE(acpi, i2c_gpio_acpi_match); diff --git a/drivers/i2c/busses/i2c-hisi.c b/drivers/i2c/busses/i2c-hisi.c index ba5c9579ae19..fca1ca011312 100644 --- a/drivers/i2c/busses/i2c-hisi.c +++ b/drivers/i2c/busses/i2c-hisi.c @@ -516,7 +516,7 @@ static int hisi_i2c_probe(struct platform_device *pdev) } static const struct acpi_device_id hisi_i2c_acpi_ids[] = { - { "HISI03D1", 0 }, + { .id = "HISI03D1" }, { } }; MODULE_DEVICE_TABLE(acpi, hisi_i2c_acpi_ids); diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 19ec056b00af..e5fb493327b1 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -349,7 +349,7 @@ static const struct of_device_id i2c_imx_dt_ids[] = { MODULE_DEVICE_TABLE(of, i2c_imx_dt_ids); static const struct acpi_device_id i2c_imx_acpi_ids[] = { - {"NXP0001", .driver_data = (kernel_ulong_t)&vf610_i2c_hwdata}, + { .id = "NXP0001", .driver_data = (kernel_ulong_t)&vf610_i2c_hwdata }, { } }; MODULE_DEVICE_TABLE(acpi, i2c_imx_acpi_ids); diff --git a/drivers/i2c/busses/i2c-ls2x.c b/drivers/i2c/busses/i2c-ls2x.c index af7bf61b0f4d..ef2e2a26981e 100644 --- a/drivers/i2c/busses/i2c-ls2x.c +++ b/drivers/i2c/busses/i2c-ls2x.c @@ -356,7 +356,7 @@ static const struct of_device_id ls2x_i2c_id_table[] = { MODULE_DEVICE_TABLE(of, ls2x_i2c_id_table); static const struct acpi_device_id ls2x_i2c_acpi_match[] = { - { "LOON0004" }, /* Loongson LS7A */ + { .id = "LOON0004" }, /* Loongson LS7A */ { } }; MODULE_DEVICE_TABLE(acpi, ls2x_i2c_acpi_match); diff --git a/drivers/i2c/busses/i2c-mlxbf.c b/drivers/i2c/busses/i2c-mlxbf.c index 24ccc4546ab8..0cc8b9e5f333 100644 --- a/drivers/i2c/busses/i2c-mlxbf.c +++ b/drivers/i2c/busses/i2c-mlxbf.c @@ -2198,10 +2198,10 @@ static struct i2c_adapter_quirks mlxbf_i2c_quirks = { }; static const struct acpi_device_id mlxbf_i2c_acpi_ids[] = { - { "MLNXBF03", (kernel_ulong_t)&mlxbf_i2c_chip[MLXBF_I2C_CHIP_TYPE_1] }, - { "MLNXBF23", (kernel_ulong_t)&mlxbf_i2c_chip[MLXBF_I2C_CHIP_TYPE_2] }, - { "MLNXBF31", (kernel_ulong_t)&mlxbf_i2c_chip[MLXBF_I2C_CHIP_TYPE_3] }, - {}, + { .id = "MLNXBF03", .driver_data = (kernel_ulong_t)&mlxbf_i2c_chip[MLXBF_I2C_CHIP_TYPE_1] }, + { .id = "MLNXBF23", .driver_data = (kernel_ulong_t)&mlxbf_i2c_chip[MLXBF_I2C_CHIP_TYPE_2] }, + { .id = "MLNXBF31", .driver_data = (kernel_ulong_t)&mlxbf_i2c_chip[MLXBF_I2C_CHIP_TYPE_3] }, + { } }; MODULE_DEVICE_TABLE(acpi, mlxbf_i2c_acpi_ids); diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c index 01d1fdab5163..3fa69de30b06 100644 --- a/drivers/i2c/busses/i2c-qcom-geni.c +++ b/drivers/i2c/busses/i2c-qcom-geni.c @@ -1298,8 +1298,8 @@ static const struct geni_i2c_desc sa8255p_geni_i2c = { #ifdef CONFIG_ACPI static const struct acpi_device_id geni_i2c_acpi_match[] = { - { "QCOM0220", (kernel_ulong_t)&geni_i2c}, - { "QCOM0411", (kernel_ulong_t)&geni_i2c}, + { .id = "QCOM0220", .driver_data = (kernel_ulong_t)&geni_i2c }, + { .id = "QCOM0411", .driver_data = (kernel_ulong_t)&geni_i2c }, { } }; MODULE_DEVICE_TABLE(acpi, geni_i2c_acpi_match); diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c index ee7915ee2ba2..ce30634e1f40 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c @@ -1688,7 +1688,7 @@ static void qup_i2c_disable_clocks(struct qup_i2c_dev *qup) } static const struct acpi_device_id qup_i2c_acpi_match[] = { - { "QCOM8010"}, + { .id = "QCOM8010" }, { } }; MODULE_DEVICE_TABLE(acpi, qup_i2c_acpi_match); diff --git a/drivers/i2c/busses/i2c-scmi.c b/drivers/i2c/busses/i2c-scmi.c index 324a63efa1ab..37442c9ee222 100644 --- a/drivers/i2c/busses/i2c-scmi.c +++ b/drivers/i2c/busses/i2c-scmi.c @@ -42,10 +42,10 @@ static const struct smbus_methods_t ibm_smbus_methods = { }; static const struct acpi_device_id acpi_smbus_cmi_ids[] = { - {"SMBUS01", (kernel_ulong_t)&smbus_methods}, - {ACPI_SMBUS_IBM_HID, (kernel_ulong_t)&ibm_smbus_methods}, - {ACPI_SMBUS_MS_HID, (kernel_ulong_t)&smbus_methods}, - {"", 0} + { .id = "SMBUS01", .driver_data = (kernel_ulong_t)&smbus_methods }, + { .id = ACPI_SMBUS_IBM_HID, .driver_data = (kernel_ulong_t)&ibm_smbus_methods }, + { .id = ACPI_SMBUS_MS_HID, .driver_data = (kernel_ulong_t)&smbus_methods }, + { } }; MODULE_DEVICE_TABLE(acpi, acpi_smbus_cmi_ids); diff --git a/drivers/i2c/busses/i2c-synquacer.c b/drivers/i2c/busses/i2c-synquacer.c index 0216e398f274..968cbe32161e 100644 --- a/drivers/i2c/busses/i2c-synquacer.c +++ b/drivers/i2c/busses/i2c-synquacer.c @@ -622,8 +622,8 @@ MODULE_DEVICE_TABLE(of, synquacer_i2c_dt_ids); #ifdef CONFIG_ACPI static const struct acpi_device_id synquacer_i2c_acpi_ids[] = { - { "SCX0003" }, - { /* sentinel */ } + { .id = "SCX0003" }, + { } }; MODULE_DEVICE_TABLE(acpi, synquacer_i2c_acpi_ids); #endif diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 9c281b4905eb..76d21bc51c61 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -2486,10 +2486,10 @@ static const struct dev_pm_ops tegra_i2c_pm = { }; static const struct acpi_device_id tegra_i2c_acpi_match[] = { - {.id = "NVDA0101", .driver_data = (kernel_ulong_t)&tegra210_i2c_hw}, - {.id = "NVDA0201", .driver_data = (kernel_ulong_t)&tegra186_i2c_hw}, - {.id = "NVDA0301", .driver_data = (kernel_ulong_t)&tegra194_i2c_hw}, - {.id = "NVDA2017", .driver_data = (kernel_ulong_t)&tegra410_i2c_hw}, + { .id = "NVDA0101", .driver_data = (kernel_ulong_t)&tegra210_i2c_hw }, + { .id = "NVDA0201", .driver_data = (kernel_ulong_t)&tegra186_i2c_hw }, + { .id = "NVDA0301", .driver_data = (kernel_ulong_t)&tegra194_i2c_hw }, + { .id = "NVDA2017", .driver_data = (kernel_ulong_t)&tegra410_i2c_hw }, { } }; MODULE_DEVICE_TABLE(acpi, tegra_i2c_acpi_match); diff --git a/drivers/i2c/busses/i2c-usbio.c b/drivers/i2c/busses/i2c-usbio.c index 259754e5fd05..66da1e90848a 100644 --- a/drivers/i2c/busses/i2c-usbio.c +++ b/drivers/i2c/busses/i2c-usbio.c @@ -24,12 +24,12 @@ struct usbio_i2c { }; static const struct acpi_device_id usbio_i2c_acpi_hids[] = { - { "INTC1008" }, /* MTL */ - { "INTC10B3" }, /* ARL */ - { "INTC10B6" }, /* LNL */ - { "INTC10D2" }, /* MTL-CVF */ - { "INTC10E3" }, /* PTL */ - { "INTC1118" }, /* NVL */ + { .id = "INTC1008" }, /* MTL */ + { .id = "INTC10B3" }, /* ARL */ + { .id = "INTC10B6" }, /* LNL */ + { .id = "INTC10D2" }, /* MTL-CVF */ + { .id = "INTC10E3" }, /* PTL */ + { .id = "INTC1118" }, /* NVL */ { } }; diff --git a/drivers/i2c/busses/i2c-viai2c-zhaoxin.c b/drivers/i2c/busses/i2c-viai2c-zhaoxin.c index 764a2dbc957a..81f0bfdf919f 100644 --- a/drivers/i2c/busses/i2c-viai2c-zhaoxin.c +++ b/drivers/i2c/busses/i2c-viai2c-zhaoxin.c @@ -345,7 +345,7 @@ static const struct dev_pm_ops zxi2c_pm = { }; static const struct acpi_device_id zxi2c_acpi_match[] = { - {"IIC1D17", 0 }, + { .id = "IIC1D17" }, { } }; MODULE_DEVICE_TABLE(acpi, zxi2c_acpi_match); diff --git a/drivers/i2c/busses/i2c-xgene-slimpro.c b/drivers/i2c/busses/i2c-xgene-slimpro.c index b29dec66b2c3..08a126aa83df 100644 --- a/drivers/i2c/busses/i2c-xgene-slimpro.c +++ b/drivers/i2c/busses/i2c-xgene-slimpro.c @@ -539,9 +539,9 @@ MODULE_DEVICE_TABLE(of, xgene_slimpro_i2c_dt_ids); #ifdef CONFIG_ACPI static const struct acpi_device_id xgene_slimpro_i2c_acpi_ids[] = { - {"APMC0D40", XGENE_SLIMPRO_I2C_V1}, - {"APMC0D8B", XGENE_SLIMPRO_I2C_V2}, - {} + { .id = "APMC0D40", .driver_data = XGENE_SLIMPRO_I2C_V1 }, + { .id = "APMC0D8B", .driver_data = XGENE_SLIMPRO_I2C_V2 }, + { } }; MODULE_DEVICE_TABLE(acpi, xgene_slimpro_i2c_acpi_ids); #endif diff --git a/drivers/i2c/busses/i2c-xlp9xx.c b/drivers/i2c/busses/i2c-xlp9xx.c index ad0e5cd218f0..44cad95ee8ab 100644 --- a/drivers/i2c/busses/i2c-xlp9xx.c +++ b/drivers/i2c/busses/i2c-xlp9xx.c @@ -570,9 +570,9 @@ static void xlp9xx_i2c_remove(struct platform_device *pdev) #ifdef CONFIG_ACPI static const struct acpi_device_id xlp9xx_i2c_acpi_ids[] = { - {"BRCM9007", 0}, - {"CAV9007", 0}, - {} + { .id = "BRCM9007" }, + { .id = "CAV9007" }, + { } }; MODULE_DEVICE_TABLE(acpi, xlp9xx_i2c_acpi_ids); #endif