* [PATCH v4 01/20] mfd: bcm2835-pm: Remove member of struct bcm2835_pm that is only used locally
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-11 9:30 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 02/20] mfd: bcm2835-pm: Drop unused header Uwe Kleine-König (The Capable Hub)
` (18 subsequent siblings)
19 siblings, 1 reply; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones
Cc: Florian Fainelli, Broadcom internal kernel review list, Ray Jui,
Scott Branden, mfd, linux-rpi-kernel, linux-arm-kernel,
linux-kernel, Linus Walleij
struct bcm2835_pm::soc is only used in bcm2835_pm_probe() and thus can be
replaced by a local variable.
With that change enum bcm2835_soc is only used in the mfd core driver and
so the definition can move there.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/bcm2835-pm.c | 11 +++++++++--
include/linux/mfd/bcm2835-pm.h | 7 -------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c
index 9e8e3dcf4bce..87de35075419 100644
--- a/drivers/mfd/bcm2835-pm.c
+++ b/drivers/mfd/bcm2835-pm.c
@@ -69,10 +69,17 @@ static int bcm2835_pm_get_pdata(struct platform_device *pdev,
return 0;
}
+enum bcm2835_soc {
+ BCM2835_PM_SOC_BCM2835,
+ BCM2835_PM_SOC_BCM2711,
+ BCM2835_PM_SOC_BCM2712,
+};
+
static int bcm2835_pm_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct bcm2835_pm *pm;
+ enum bcm2835_soc soc;
int ret;
pm = devm_kzalloc(dev, sizeof(*pm), GFP_KERNEL);
@@ -81,7 +88,7 @@ static int bcm2835_pm_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, pm);
pm->dev = dev;
- pm->soc = (uintptr_t)device_get_match_data(dev);
+ soc = (uintptr_t)device_get_match_data(dev);
ret = bcm2835_pm_get_pdata(pdev, pm);
if (ret)
@@ -98,7 +105,7 @@ static int bcm2835_pm_probe(struct platform_device *pdev)
* bcm2835-pm binding as the key for whether we can reference
* the full PM register range and support power domains.
*/
- if (pm->asb || pm->soc == BCM2835_PM_SOC_BCM2712)
+ if (pm->asb || soc == BCM2835_PM_SOC_BCM2712)
return devm_mfd_add_devices(dev, -1, bcm2835_power_devs,
ARRAY_SIZE(bcm2835_power_devs),
NULL, 0, NULL);
diff --git a/include/linux/mfd/bcm2835-pm.h b/include/linux/mfd/bcm2835-pm.h
index d2e17ab1dbfc..f70a810c55f7 100644
--- a/include/linux/mfd/bcm2835-pm.h
+++ b/include/linux/mfd/bcm2835-pm.h
@@ -5,18 +5,11 @@
#include <linux/regmap.h>
-enum bcm2835_soc {
- BCM2835_PM_SOC_BCM2835,
- BCM2835_PM_SOC_BCM2711,
- BCM2835_PM_SOC_BCM2712,
-};
-
struct bcm2835_pm {
struct device *dev;
void __iomem *base;
void __iomem *asb;
void __iomem *rpivid_asb;
- enum bcm2835_soc soc;
};
#endif /* BCM2835_MFD_PM_H */
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH v4 01/20] mfd: bcm2835-pm: Remove member of struct bcm2835_pm that is only used locally
2026-11-10 21:54 ` [PATCH v4 01/20] mfd: bcm2835-pm: Remove member of struct bcm2835_pm that is only used locally Uwe Kleine-König (The Capable Hub)
@ 2026-11-11 9:30 ` Uwe Kleine-König (The Capable Hub)
0 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-11 9:30 UTC (permalink / raw)
To: Lee Jones
Cc: Florian Fainelli, Broadcom internal kernel review list, mfd,
linux-rpi-kernel, linux-arm-kernel, linux-kernel, Linus Walleij,
Stanimir Varbanov
[-- Attachment #1: Type: text/plain, Size: 1538 bytes --]
[dropping Ray Jui and Scott Branden from Cc:; their addresses don't
exist any more, adding Stanimir instead]
Hello,
On Tue, Nov 10, 2026 at 10:54:26PM +0100, Uwe Kleine-König (The Capable Hub) wrote:
> struct bcm2835_pm::soc is only used in bcm2835_pm_probe() and thus can be
> replaced by a local variable.
>
> With that change enum bcm2835_soc is only used in the mfd core driver and
> so the definition can move there.
>
> Reviewed-by: Linus Walleij <linusw@kernel.org>
> Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
While going through my list of open patches I noticed that I got a
review comment about this patch in v2 by Stanimir Varbanov[1]. He said
in July:
> The original idea was to re-use bcm2835_pm::soc field in bcm2835-power.c
> pmdomain driver where we implicitly decide which DOMAIN_GRAFX_V3D
> register to use (see commit d4aa5960025a "pmdomain: bcm: bcm2835-power:
> Prepare to support BCM2712"). So, instead of !power->asb the intention
> is to use bcm2835_pm::soc == BCM2835_PM_SOC_BCM2712.
>
> Please drop this patch from the series. I'll post a patch soon.
As of next-20261110 drivers/mfd/bcm2835-pm.c is still the only user of
enum bcm2835_soc and
https://lore.kernel.org/all/?q=dfn%3Adrivers%2Fpmdomain%2Fbcm%2Fbcm2835-power.c+soc+d%3A2026-07-10..
suggests that "soon" didn't happen yet. I think it's ok to assume this
request has expired.
Best regards
Uwe
[1] https://lore.kernel.org/b3d228fd-6138-4195-b63c-65b28691e18b@suse.de
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v4 02/20] mfd: bcm2835-pm: Drop unused header
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 01/20] mfd: bcm2835-pm: Remove member of struct bcm2835_pm that is only used locally Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 03/20] mfd: kempld: Simplify device abstraction Uwe Kleine-König (The Capable Hub)
` (17 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones
Cc: Florian Fainelli, Ray Jui, Scott Branden,
Broadcom internal kernel review list, mfd, linux-rpi-kernel,
linux-arm-kernel, linux-kernel, Linus Walleij
<linux/mfd/bcm2835-pm.h> doesn't use any symbols provided by
<linux/regmap.h>, and neither does any of its users (i.e.
drivers/mfd/bcm2835-pm.c, drivers/pmdomain/bcm/bcm2835-power.c,
drivers/watchdog/bcm2835_wdt.c).
So the header is unused and can be dropped.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
include/linux/mfd/bcm2835-pm.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/linux/mfd/bcm2835-pm.h b/include/linux/mfd/bcm2835-pm.h
index f70a810c55f7..12bb6bc2c07f 100644
--- a/include/linux/mfd/bcm2835-pm.h
+++ b/include/linux/mfd/bcm2835-pm.h
@@ -3,8 +3,6 @@
#ifndef BCM2835_MFD_PM_H
#define BCM2835_MFD_PM_H
-#include <linux/regmap.h>
-
struct bcm2835_pm {
struct device *dev;
void __iomem *base;
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* [PATCH v4 03/20] mfd: kempld: Simplify device abstraction
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 01/20] mfd: bcm2835-pm: Remove member of struct bcm2835_pm that is only used locally Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 02/20] mfd: bcm2835-pm: Drop unused header Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 04/20] mfd: lp87565: Explicitly set driver data for the generic dt compatible Uwe Kleine-König (The Capable Hub)
` (16 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones; +Cc: mfd, linux-kernel, Linus Walleij
The devices that are created by the driver from DMI data and also ACPI
devices all use the same platform data. Other devices don't exist. (A
provider of such a device would need to know about struct
kempld_platform_data, but none of the other consumers of
<linux/mfd/kempld.h> creates devices.)
Simplify the driver by hardcoding this instead of using the ACPI
abstraction for multi-variant support without real variants.
Then apart from .gpio_base all members of `struct kempld_platform_data`
are only used in drivers/mfd/kempld-core.c, so they can be dropped.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/kempld-core.c | 64 ++++++++++----------------------------
include/linux/mfd/kempld.h | 12 -------
2 files changed, 16 insertions(+), 60 deletions(-)
diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
index 47062f876e5d..fbbff3eac500 100644
--- a/drivers/mfd/kempld-core.c
+++ b/drivers/mfd/kempld-core.c
@@ -118,25 +118,19 @@ static struct resource kempld_ioresource = {
};
static const struct kempld_platform_data kempld_platform_data_generic = {
- .pld_clock = KEMPLD_CLK,
- .ioresource = &kempld_ioresource,
- .get_hardware_mutex = kempld_get_hardware_mutex,
- .release_hardware_mutex = kempld_release_hardware_mutex,
- .get_info = kempld_get_info_generic,
- .register_cells = kempld_register_cells_generic,
};
static struct platform_device *kempld_pdev;
-static int kempld_create_platform_device(const struct kempld_platform_data *pdata)
+static int kempld_create_platform_device(void)
{
const struct platform_device_info pdevinfo = {
.name = "kempld",
.id = PLATFORM_DEVID_NONE,
- .res = pdata->ioresource,
+ .res = &kempld_ioresource,
.num_res = 1,
- .data = pdata,
- .size_data = sizeof(*pdata),
+ .data = &kempld_platform_data_generic,
+ .size_data = sizeof(kempld_platform_data_generic),
};
kempld_pdev = platform_device_register_full(&pdevinfo);
@@ -235,10 +229,8 @@ EXPORT_SYMBOL_GPL(kempld_write32);
*/
void kempld_get_mutex(struct kempld_device_data *pld)
{
- const struct kempld_platform_data *pdata = dev_get_platdata(pld->dev);
-
mutex_lock(&pld->lock);
- pdata->get_hardware_mutex(pld);
+ kempld_get_hardware_mutex(pld);
}
EXPORT_SYMBOL_GPL(kempld_get_mutex);
@@ -248,9 +240,7 @@ EXPORT_SYMBOL_GPL(kempld_get_mutex);
*/
void kempld_release_mutex(struct kempld_device_data *pld)
{
- const struct kempld_platform_data *pdata = dev_get_platdata(pld->dev);
-
- pdata->release_hardware_mutex(pld);
+ kempld_release_hardware_mutex(pld);
mutex_unlock(&pld->lock);
}
EXPORT_SYMBOL_GPL(kempld_release_mutex);
@@ -266,10 +256,9 @@ EXPORT_SYMBOL_GPL(kempld_release_mutex);
static int kempld_get_info(struct kempld_device_data *pld)
{
int ret;
- const struct kempld_platform_data *pdata = dev_get_platdata(pld->dev);
char major, minor;
- ret = pdata->get_info(pld);
+ ret = kempld_get_info_generic(pld);
if (ret)
return ret;
@@ -296,20 +285,6 @@ static int kempld_get_info(struct kempld_device_data *pld)
return 0;
}
-/*
- * kempld_register_cells - register cell drivers
- *
- * This function registers cell drivers for the detected hardware by calling
- * the configured kempld_register_cells_XXXX function which is responsible
- * to detect and register the needed cell drivers.
- */
-static int kempld_register_cells(struct kempld_device_data *pld)
-{
- const struct kempld_platform_data *pdata = dev_get_platdata(pld->dev);
-
- return pdata->register_cells(pld);
-}
-
static const char *kempld_get_type_string(struct kempld_device_data *pld)
{
const char *version_type;
@@ -399,12 +374,12 @@ static int kempld_detect_device(struct kempld_device_data *pld)
pld->info.version, kempld_get_type_string(pld),
pld->info.spec_major, pld->info.spec_minor);
- return kempld_register_cells(pld);
+ return kempld_register_cells_generic(pld);
}
static int kempld_probe(struct platform_device *pdev)
{
- const struct kempld_platform_data *pdata;
+ const struct kempld_platform_data *pdata = &kempld_platform_data_generic;
struct device *dev = &pdev->dev;
struct kempld_device_data *pld;
struct resource *ioport;
@@ -415,16 +390,10 @@ static int kempld_probe(struct platform_device *pdev)
* No kempld_pdev device has been registered in kempld_init,
* so we seem to be probing an ACPI platform device.
*/
- pdata = device_get_match_data(dev);
- if (!pdata)
- return -ENODEV;
-
ret = platform_device_add_data(pdev, pdata, sizeof(*pdata));
if (ret)
return ret;
- } else if (kempld_pdev == pdev) {
- pdata = dev_get_platdata(dev);
- } else {
+ } else if (kempld_pdev != pdev) {
/*
* The platform device we are probing is not the one we
* registered in kempld_init using the DMI table, so this one
@@ -451,7 +420,7 @@ static int kempld_probe(struct platform_device *pdev)
pld->io_index = pld->io_base;
pld->io_data = pld->io_base + 1;
- pld->pld_clock = pdata->pld_clock;
+ pld->pld_clock = KEMPLD_CLK;
pld->dev = dev;
mutex_init(&pld->lock);
@@ -463,15 +432,14 @@ static int kempld_probe(struct platform_device *pdev)
static void kempld_remove(struct platform_device *pdev)
{
struct kempld_device_data *pld = platform_get_drvdata(pdev);
- const struct kempld_platform_data *pdata = dev_get_platdata(pld->dev);
mfd_remove_devices(&pdev->dev);
- pdata->release_hardware_mutex(pld);
+ kempld_release_hardware_mutex(pld);
}
static const struct acpi_device_id kempld_acpi_table[] = {
- { "KEM0000", (kernel_ulong_t)&kempld_platform_data_generic },
- { "KEM0001", (kernel_ulong_t)&kempld_platform_data_generic },
+ { "KEM0000" },
+ { "KEM0001" },
{}
};
MODULE_DEVICE_TABLE(acpi, kempld_acpi_table);
@@ -787,13 +755,13 @@ static int __init kempld_init(void)
if (force_device_id[0]) {
for (id = kempld_dmi_table; id->matches[0].slot != DMI_NONE; id++)
if (strstr(id->ident, force_device_id))
- if (!kempld_create_platform_device(&kempld_platform_data_generic))
+ if (!kempld_create_platform_device())
break;
if (id->matches[0].slot == DMI_NONE)
return -ENODEV;
} else {
for (id = dmi_first_match(kempld_dmi_table); id; id = dmi_first_match(id+1))
- if (kempld_create_platform_device(&kempld_platform_data_generic))
+ if (kempld_create_platform_device())
break;
}
return platform_driver_register(&kempld_driver);
diff --git a/include/linux/mfd/kempld.h b/include/linux/mfd/kempld.h
index 5d75071eaaea..d7a823ba1a7a 100644
--- a/include/linux/mfd/kempld.h
+++ b/include/linux/mfd/kempld.h
@@ -97,22 +97,10 @@ struct kempld_device_data {
/**
* struct kempld_platform_data - PLD hardware configuration structure
- * @pld_clock: PLD clock frequency
* @gpio_base: GPIO base pin number
- * @ioresource: IO addresses of the PLD
- * @get_hardware_mutex: PLD specific get_mutex callback
- * @release_hardware_mutex: PLD specific release_mutex callback
- * @get_info: PLD specific get_info callback
- * @register_cells: PLD specific register_cells callback
*/
struct kempld_platform_data {
- u32 pld_clock;
int gpio_base;
- struct resource *ioresource;
- void (*get_hardware_mutex) (struct kempld_device_data *);
- void (*release_hardware_mutex) (struct kempld_device_data *);
- int (*get_info) (struct kempld_device_data *);
- int (*register_cells) (struct kempld_device_data *);
};
extern void kempld_get_mutex(struct kempld_device_data *pld);
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* [PATCH v4 04/20] mfd: lp87565: Explicitly set driver data for the generic dt compatible
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (2 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 03/20] mfd: kempld: Simplify device abstraction Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 05/20] mfd: mt6360: Drop irrelevant __maybe_unused Uwe Kleine-König (The Capable Hub)
` (15 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones; +Cc: mfd, linux-kernel, Linus Walleij
The driver relies on .data being (void *)LP87565_DEVICE_TYPE_UNKNOWN
(i.e. NULL) for the generic device tree compatible. Make this explicit.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/lp87565.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/mfd/lp87565.c b/drivers/mfd/lp87565.c
index b78ae79df5fa..efea1ba82811 100644
--- a/drivers/mfd/lp87565.c
+++ b/drivers/mfd/lp87565.c
@@ -26,7 +26,10 @@ static const struct mfd_cell lp87565_cells[] = {
};
static const struct of_device_id of_lp87565_match_table[] = {
- { .compatible = "ti,lp87565", },
+ {
+ .compatible = "ti,lp87565",
+ .data = (void *)LP87565_DEVICE_TYPE_UNKNOWN,
+ },
{
.compatible = "ti,lp87524-q1",
.data = (void *)LP87565_DEVICE_TYPE_LP87524_Q1,
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* [PATCH v4 05/20] mfd: mt6360: Drop irrelevant __maybe_unused
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (3 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 04/20] mfd: lp87565: Explicitly set driver data for the generic dt compatible Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 06/20] mfd: rt4831: " Uwe Kleine-König (The Capable Hub)
` (14 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones
Cc: Matthias Brugger, AngeloGioacchino Del Regno, mfd, linux-kernel,
linux-arm-kernel, linux-mediatek, Linus Walleij
Since commit 5ab23c7923a1 ("modpost: Create modalias for builtin
modules") MODULE_DEVICE_TABLE() is enough to reference a device id array
even if the driver is built-in. So mt6360_of_id[] is always used and the
__maybe_unused marker serves no purpose and can be dropped.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/mt6360-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/mt6360-core.c b/drivers/mfd/mt6360-core.c
index 8a97c30cad3f..8263e3ff8315 100644
--- a/drivers/mfd/mt6360-core.c
+++ b/drivers/mfd/mt6360-core.c
@@ -606,7 +606,7 @@ static int mt6360_resume(struct device *dev)
static DEFINE_SIMPLE_DEV_PM_OPS(mt6360_pm_ops, mt6360_suspend, mt6360_resume);
-static const struct of_device_id __maybe_unused mt6360_of_id[] = {
+static const struct of_device_id mt6360_of_id[] = {
{ .compatible = "mediatek,mt6360", },
{},
};
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* [PATCH v4 06/20] mfd: rt4831: Drop irrelevant __maybe_unused
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (4 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 05/20] mfd: mt6360: Drop irrelevant __maybe_unused Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 07/20] mfd: loongson-se: Drop unused assignment of acpi_device_id driver data Uwe Kleine-König (The Capable Hub)
` (13 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones; +Cc: mfd, linux-kernel, Linus Walleij
Since commit 5ab23c7923a1 ("modpost: Create modalias for builtin
modules") MODULE_DEVICE_TABLE() is enough to reference a device id array
even if the driver is built-in. So rt4831_of_match[] is always used and the
__maybe_unused marker serves no purpose and can be dropped.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/rt4831.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/rt4831.c b/drivers/mfd/rt4831.c
index 1ab8870e4ebf..2b3f84b81c65 100644
--- a/drivers/mfd/rt4831.c
+++ b/drivers/mfd/rt4831.c
@@ -98,7 +98,7 @@ static void rt4831_remove(struct i2c_client *client)
dev_warn(&client->dev, "Failed to disable outputs (%pe)\n", ERR_PTR(ret));
}
-static const struct of_device_id __maybe_unused rt4831_of_match[] = {
+static const struct of_device_id rt4831_of_match[] = {
{ .compatible = "richtek,rt4831", },
{}
};
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* [PATCH v4 07/20] mfd: loongson-se: Drop unused assignment of acpi_device_id driver data
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (5 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 06/20] mfd: rt4831: " Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 08/20] mfd: Drop unused assignment of i2c_device_id " Uwe Kleine-König (The Capable Hub)
` (12 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones; +Cc: Qunqin Zhao, linux-crypto, mfd, linux-kernel, Linus Walleij
The driver explicitly set the .driver_data member of struct
acpi_device_id to zero without relying on that value. Drop this unused
assignment.
This patch doesn't modify the compiled array, only its representation in
source form benefits.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/loongson-se.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/loongson-se.c b/drivers/mfd/loongson-se.c
index 3902ba377d69..4c668e2d2241 100644
--- a/drivers/mfd/loongson-se.c
+++ b/drivers/mfd/loongson-se.c
@@ -233,7 +233,7 @@ static int loongson_se_probe(struct platform_device *pdev)
}
static const struct acpi_device_id loongson_se_acpi_match[] = {
- { "LOON0011", 0 },
+ { "LOON0011" },
{ }
};
MODULE_DEVICE_TABLE(acpi, loongson_se_acpi_match);
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* [PATCH v4 08/20] mfd: Drop unused assignment of i2c_device_id driver data
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (6 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 07/20] mfd: loongson-se: Drop unused assignment of acpi_device_id driver data Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 09/20] mfd: Drop unused assignment of platform_device_id " Uwe Kleine-König (The Capable Hub)
` (11 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones; +Cc: mfd, linux-kernel, Linus Walleij
The drivers explicitly set the .driver_data member of struct
i2c_device_id to zero without relying on that value. Drop these
unused assignments.
This patch doesn't modify the compiled arrays, only their representation
in source form benefits.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/as3711.c | 2 +-
drivers/mfd/rc5t583.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/as3711.c b/drivers/mfd/as3711.c
index 9741977031df..eb03b813d58f 100644
--- a/drivers/mfd/as3711.c
+++ b/drivers/mfd/as3711.c
@@ -192,7 +192,7 @@ static int as3711_i2c_probe(struct i2c_client *client)
}
static const struct i2c_device_id as3711_i2c_id[] = {
- {.name = "as3711", .driver_data = 0},
+ { .name = "as3711" },
{}
};
diff --git a/drivers/mfd/rc5t583.c b/drivers/mfd/rc5t583.c
index 2c0e8e9630f7..4ad761fbfab2 100644
--- a/drivers/mfd/rc5t583.c
+++ b/drivers/mfd/rc5t583.c
@@ -280,7 +280,7 @@ static int rc5t583_i2c_probe(struct i2c_client *i2c)
}
static const struct i2c_device_id rc5t583_i2c_id[] = {
- {.name = "rc5t583", .driver_data = 0},
+ { .name = "rc5t583" },
{}
};
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* [PATCH v4 09/20] mfd: Drop unused assignment of platform_device_id driver data
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (7 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 08/20] mfd: Drop unused assignment of i2c_device_id " Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 23:05 ` Benson Leung
2026-11-10 21:54 ` [PATCH v4 10/20] mfd: Use named initializers for acpi_device_id arrays Uwe Kleine-König (The Capable Hub)
` (10 subsequent siblings)
19 siblings, 1 reply; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones
Cc: Benson Leung, Guenter Roeck, Matthias Brugger,
AngeloGioacchino Del Regno, mfd, chrome-platform, linux-kernel,
linux-arm-kernel, linux-mediatek, Linus Walleij
The drivers explicitly set the .driver_data member of struct
platform_device_id to zero without relying on that value. Drop these
unused assignments
This patch doesn't modify the compiled arrays, only their representation
in source form benefits.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/cros_ec_dev.c | 2 +-
drivers/mfd/mt6397-core.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index 529a23b804f7..96aac158fd8b 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -379,7 +379,7 @@ static void ec_device_remove(struct platform_device *pdev)
}
static const struct platform_device_id cros_ec_id[] = {
- { DRV_NAME, 0 },
+ { DRV_NAME },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(platform, cros_ec_id);
diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
index 5d5f816492aa..e74936ac206f 100644
--- a/drivers/mfd/mt6397-core.c
+++ b/drivers/mfd/mt6397-core.c
@@ -435,7 +435,7 @@ static const struct of_device_id mt6397_of_match[] = {
MODULE_DEVICE_TABLE(of, mt6397_of_match);
static const struct platform_device_id mt6397_id[] = {
- { "mt6397", 0 },
+ { "mt6397" },
{ },
};
MODULE_DEVICE_TABLE(platform, mt6397_id);
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH v4 09/20] mfd: Drop unused assignment of platform_device_id driver data
2026-11-10 21:54 ` [PATCH v4 09/20] mfd: Drop unused assignment of platform_device_id " Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 23:05 ` Benson Leung
0 siblings, 0 replies; 29+ messages in thread
From: Benson Leung @ 2026-11-10 23:05 UTC (permalink / raw)
To: Uwe Kleine-König (The Capable Hub)
Cc: Lee Jones, Benson Leung, Guenter Roeck, Matthias Brugger,
AngeloGioacchino Del Regno, mfd, chrome-platform, linux-kernel,
linux-arm-kernel, linux-mediatek, Linus Walleij
[-- Attachment #1: Type: text/plain, Size: 1637 bytes --]
On Tue, Nov 10, 2026 at 10:54:34PM +0100, Uwe Kleine-König (The Capable Hub) wrote:
> The drivers explicitly set the .driver_data member of struct
> platform_device_id to zero without relying on that value. Drop these
> unused assignments
>
> This patch doesn't modify the compiled arrays, only their representation
> in source form benefits.
>
> Reviewed-by: Linus Walleij <linusw@kernel.org>
> Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Reviewed-by: Benson Leung <bleung@chromium.org>
> ---
> drivers/mfd/cros_ec_dev.c | 2 +-
> drivers/mfd/mt6397-core.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
> index 529a23b804f7..96aac158fd8b 100644
> --- a/drivers/mfd/cros_ec_dev.c
> +++ b/drivers/mfd/cros_ec_dev.c
> @@ -379,7 +379,7 @@ static void ec_device_remove(struct platform_device *pdev)
> }
>
> static const struct platform_device_id cros_ec_id[] = {
> - { DRV_NAME, 0 },
> + { DRV_NAME },
> { /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(platform, cros_ec_id);
> diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
> index 5d5f816492aa..e74936ac206f 100644
> --- a/drivers/mfd/mt6397-core.c
> +++ b/drivers/mfd/mt6397-core.c
> @@ -435,7 +435,7 @@ static const struct of_device_id mt6397_of_match[] = {
> MODULE_DEVICE_TABLE(of, mt6397_of_match);
>
> static const struct platform_device_id mt6397_id[] = {
> - { "mt6397", 0 },
> + { "mt6397" },
> { },
> };
> MODULE_DEVICE_TABLE(platform, mt6397_id);
> --
> 2.56.0.rc1
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v4 10/20] mfd: Use named initializers for acpi_device_id arrays
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (8 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 09/20] mfd: Drop unused assignment of platform_device_id " Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-11 8:45 ` Andy Shevchenko
2026-11-10 21:54 ` [PATCH v4 11/20] mfd: intel-m10-bmc-pmci: Use named initializers for dfl_device_id array Uwe Kleine-König (The Capable Hub)
` (9 subsequent siblings)
19 siblings, 1 reply; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones
Cc: David Rhodes, Richard Fitzgerald, Andy Shevchenko,
Mika Westerberg, Zha Qipeng, Qunqin Zhao, Thomas Richard,
linux-sound, patches, mfd, linux-kernel, linux-crypto,
Charles Keepax, Linus Walleij
While being less compact, using named initializers allows to more easily
see which members of the structs are assigned which value without having
to lookup the declaration of the struct. And it's also more robust
against changes to the struct definition.
The mentioned robustness is relevant for a planned change to struct
acpi_device_id that replaces .driver_data by an anonymous union.
This patch doesn't modify the compiled arrays, only their representation
in source form benefits.
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/cs42l43-i2c.c | 6 +--
drivers/mfd/intel-lpss-acpi.c | 58 +++++++++++++--------------
drivers/mfd/intel_pmc_bxt.c | 2 +-
drivers/mfd/intel_soc_pmic_bxtwc.c | 2 +-
drivers/mfd/intel_soc_pmic_chtdc_ti.c | 2 +-
drivers/mfd/intel_soc_pmic_chtwc.c | 2 +-
drivers/mfd/intel_soc_pmic_crc.c | 2 +-
drivers/mfd/intel_soc_pmic_mrfld.c | 2 +-
drivers/mfd/kempld-core.c | 4 +-
drivers/mfd/loongson-se.c | 2 +-
drivers/mfd/upboard-fpga.c | 4 +-
11 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/drivers/mfd/cs42l43-i2c.c b/drivers/mfd/cs42l43-i2c.c
index 2f1862199618..faf4fc6b3d73 100644
--- a/drivers/mfd/cs42l43-i2c.c
+++ b/drivers/mfd/cs42l43-i2c.c
@@ -73,9 +73,9 @@ MODULE_DEVICE_TABLE(of, cs42l43_of_match);
#if IS_ENABLED(CONFIG_ACPI)
static const struct acpi_device_id cs42l43_acpi_match[] = {
- { "CSC4243", CS42L43_DEVID_VAL },
- { "CSC2A3B", CS42L43B_DEVID_VAL },
- { "CSC4244", CS42L43B_DEVID_VAL },
+ { .id = "CSC4243", .driver_data = CS42L43_DEVID_VAL },
+ { .id = "CSC2A3B", .driver_data = CS42L43B_DEVID_VAL },
+ { .id = "CSC4244", .driver_data = CS42L43B_DEVID_VAL },
{}
};
MODULE_DEVICE_TABLE(acpi, cs42l43_acpi_match);
diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c
index 720adb0ee21f..2f46a85066bd 100644
--- a/drivers/mfd/intel-lpss-acpi.c
+++ b/drivers/mfd/intel-lpss-acpi.c
@@ -137,38 +137,38 @@ static const struct intel_lpss_platform_info cnl_i2c_info = {
static const struct acpi_device_id intel_lpss_acpi_ids[] = {
/* SPT */
- { "INT3440", (kernel_ulong_t)&spt_info },
- { "INT3441", (kernel_ulong_t)&spt_info },
- { "INT3442", (kernel_ulong_t)&spt_i2c_info },
- { "INT3443", (kernel_ulong_t)&spt_i2c_info },
- { "INT3444", (kernel_ulong_t)&spt_i2c_info },
- { "INT3445", (kernel_ulong_t)&spt_i2c_info },
- { "INT3446", (kernel_ulong_t)&spt_i2c_info },
- { "INT3447", (kernel_ulong_t)&spt_i2c_info },
- { "INT3448", (kernel_ulong_t)&spt_uart_info },
- { "INT3449", (kernel_ulong_t)&spt_uart_info },
- { "INT344A", (kernel_ulong_t)&spt_uart_info },
+ { .id = "INT3440", .driver_data = (kernel_ulong_t)&spt_info },
+ { .id = "INT3441", .driver_data = (kernel_ulong_t)&spt_info },
+ { .id = "INT3442", .driver_data = (kernel_ulong_t)&spt_i2c_info },
+ { .id = "INT3443", .driver_data = (kernel_ulong_t)&spt_i2c_info },
+ { .id = "INT3444", .driver_data = (kernel_ulong_t)&spt_i2c_info },
+ { .id = "INT3445", .driver_data = (kernel_ulong_t)&spt_i2c_info },
+ { .id = "INT3446", .driver_data = (kernel_ulong_t)&spt_i2c_info },
+ { .id = "INT3447", .driver_data = (kernel_ulong_t)&spt_i2c_info },
+ { .id = "INT3448", .driver_data = (kernel_ulong_t)&spt_uart_info },
+ { .id = "INT3449", .driver_data = (kernel_ulong_t)&spt_uart_info },
+ { .id = "INT344A", .driver_data = (kernel_ulong_t)&spt_uart_info },
/* CNL */
- { "INT34B0", (kernel_ulong_t)&cnl_info },
- { "INT34B1", (kernel_ulong_t)&cnl_info },
- { "INT34B2", (kernel_ulong_t)&cnl_i2c_info },
- { "INT34B3", (kernel_ulong_t)&cnl_i2c_info },
- { "INT34B4", (kernel_ulong_t)&cnl_i2c_info },
- { "INT34B5", (kernel_ulong_t)&cnl_i2c_info },
- { "INT34B6", (kernel_ulong_t)&cnl_i2c_info },
- { "INT34B7", (kernel_ulong_t)&cnl_i2c_info },
- { "INT34B8", (kernel_ulong_t)&spt_uart_info },
- { "INT34B9", (kernel_ulong_t)&spt_uart_info },
- { "INT34BA", (kernel_ulong_t)&spt_uart_info },
- { "INT34BC", (kernel_ulong_t)&cnl_info },
+ { .id = "INT34B0", .driver_data = (kernel_ulong_t)&cnl_info },
+ { .id = "INT34B1", .driver_data = (kernel_ulong_t)&cnl_info },
+ { .id = "INT34B2", .driver_data = (kernel_ulong_t)&cnl_i2c_info },
+ { .id = "INT34B3", .driver_data = (kernel_ulong_t)&cnl_i2c_info },
+ { .id = "INT34B4", .driver_data = (kernel_ulong_t)&cnl_i2c_info },
+ { .id = "INT34B5", .driver_data = (kernel_ulong_t)&cnl_i2c_info },
+ { .id = "INT34B6", .driver_data = (kernel_ulong_t)&cnl_i2c_info },
+ { .id = "INT34B7", .driver_data = (kernel_ulong_t)&cnl_i2c_info },
+ { .id = "INT34B8", .driver_data = (kernel_ulong_t)&spt_uart_info },
+ { .id = "INT34B9", .driver_data = (kernel_ulong_t)&spt_uart_info },
+ { .id = "INT34BA", .driver_data = (kernel_ulong_t)&spt_uart_info },
+ { .id = "INT34BC", .driver_data = (kernel_ulong_t)&cnl_info },
/* BXT */
- { "80860AAC", (kernel_ulong_t)&bxt_i2c_info },
- { "80860ABC", (kernel_ulong_t)&bxt_info },
- { "80860AC2", (kernel_ulong_t)&bxt_info },
+ { .id = "80860AAC", .driver_data = (kernel_ulong_t)&bxt_i2c_info },
+ { .id = "80860ABC", .driver_data = (kernel_ulong_t)&bxt_info },
+ { .id = "80860AC2", .driver_data = (kernel_ulong_t)&bxt_info },
/* APL */
- { "80865AAC", (kernel_ulong_t)&apl_i2c_info },
- { "80865ABC", (kernel_ulong_t)&bxt_info },
- { "80865AC2", (kernel_ulong_t)&bxt_info },
+ { .id = "80865AAC", .driver_data = (kernel_ulong_t)&apl_i2c_info },
+ { .id = "80865ABC", .driver_data = (kernel_ulong_t)&bxt_info },
+ { .id = "80865AC2", .driver_data = (kernel_ulong_t)&bxt_info },
{ }
};
MODULE_DEVICE_TABLE(acpi, intel_lpss_acpi_ids);
diff --git a/drivers/mfd/intel_pmc_bxt.c b/drivers/mfd/intel_pmc_bxt.c
index e405d7513ca1..6a9ad1f135c7 100644
--- a/drivers/mfd/intel_pmc_bxt.c
+++ b/drivers/mfd/intel_pmc_bxt.c
@@ -414,7 +414,7 @@ static int intel_pmc_create_devices(struct intel_pmc_dev *pmc)
}
static const struct acpi_device_id intel_pmc_acpi_ids[] = {
- { "INT34D2" },
+ { .id = "INT34D2" },
{ }
};
MODULE_DEVICE_TABLE(acpi, intel_pmc_acpi_ids);
diff --git a/drivers/mfd/intel_soc_pmic_bxtwc.c b/drivers/mfd/intel_soc_pmic_bxtwc.c
index 117517c171b5..08fedf3d3fee 100644
--- a/drivers/mfd/intel_soc_pmic_bxtwc.c
+++ b/drivers/mfd/intel_soc_pmic_bxtwc.c
@@ -606,7 +606,7 @@ static int bxtwc_resume(struct device *dev)
static DEFINE_SIMPLE_DEV_PM_OPS(bxtwc_pm_ops, bxtwc_suspend, bxtwc_resume);
static const struct acpi_device_id bxtwc_acpi_ids[] = {
- { "INT34D3", },
+ { .id = "INT34D3" },
{ }
};
MODULE_DEVICE_TABLE(acpi, bxtwc_acpi_ids);
diff --git a/drivers/mfd/intel_soc_pmic_chtdc_ti.c b/drivers/mfd/intel_soc_pmic_chtdc_ti.c
index 6daf33e07ea0..ff6223d6f54b 100644
--- a/drivers/mfd/intel_soc_pmic_chtdc_ti.c
+++ b/drivers/mfd/intel_soc_pmic_chtdc_ti.c
@@ -162,7 +162,7 @@ static int chtdc_ti_resume(struct device *dev)
static DEFINE_SIMPLE_DEV_PM_OPS(chtdc_ti_pm_ops, chtdc_ti_suspend, chtdc_ti_resume);
static const struct acpi_device_id chtdc_ti_acpi_ids[] = {
- { "INT33F5" },
+ { .id = "INT33F5" },
{ },
};
MODULE_DEVICE_TABLE(acpi, chtdc_ti_acpi_ids);
diff --git a/drivers/mfd/intel_soc_pmic_chtwc.c b/drivers/mfd/intel_soc_pmic_chtwc.c
index aa71a7d83fcd..413d2fd4f86a 100644
--- a/drivers/mfd/intel_soc_pmic_chtwc.c
+++ b/drivers/mfd/intel_soc_pmic_chtwc.c
@@ -261,7 +261,7 @@ static const struct i2c_device_id cht_wc_i2c_id[] = {
};
static const struct acpi_device_id cht_wc_acpi_ids[] = {
- { "INT34D3", },
+ { .id = "INT34D3" },
{ }
};
diff --git a/drivers/mfd/intel_soc_pmic_crc.c b/drivers/mfd/intel_soc_pmic_crc.c
index 627a89334908..d3db727c08de 100644
--- a/drivers/mfd/intel_soc_pmic_crc.c
+++ b/drivers/mfd/intel_soc_pmic_crc.c
@@ -252,7 +252,7 @@ static int crystal_cove_resume(struct device *dev)
static DEFINE_SIMPLE_DEV_PM_OPS(crystal_cove_pm_ops, crystal_cove_suspend, crystal_cove_resume);
static const struct acpi_device_id crystal_cove_acpi_match[] = {
- { "INT33FD" },
+ { .id = "INT33FD" },
{ },
};
MODULE_DEVICE_TABLE(acpi, crystal_cove_acpi_match);
diff --git a/drivers/mfd/intel_soc_pmic_mrfld.c b/drivers/mfd/intel_soc_pmic_mrfld.c
index 77121775c1a3..9d7e1881d693 100644
--- a/drivers/mfd/intel_soc_pmic_mrfld.c
+++ b/drivers/mfd/intel_soc_pmic_mrfld.c
@@ -139,7 +139,7 @@ static int bcove_probe(struct platform_device *pdev)
}
static const struct acpi_device_id bcove_acpi_ids[] = {
- { "INTC100E" },
+ { .id = "INTC100E" },
{}
};
MODULE_DEVICE_TABLE(acpi, bcove_acpi_ids);
diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
index fbbff3eac500..71b226a57204 100644
--- a/drivers/mfd/kempld-core.c
+++ b/drivers/mfd/kempld-core.c
@@ -438,8 +438,8 @@ static void kempld_remove(struct platform_device *pdev)
}
static const struct acpi_device_id kempld_acpi_table[] = {
- { "KEM0000" },
- { "KEM0001" },
+ { .id = "KEM0000" },
+ { .id = "KEM0001" },
{}
};
MODULE_DEVICE_TABLE(acpi, kempld_acpi_table);
diff --git a/drivers/mfd/loongson-se.c b/drivers/mfd/loongson-se.c
index 4c668e2d2241..49a95b8e4ca3 100644
--- a/drivers/mfd/loongson-se.c
+++ b/drivers/mfd/loongson-se.c
@@ -233,7 +233,7 @@ static int loongson_se_probe(struct platform_device *pdev)
}
static const struct acpi_device_id loongson_se_acpi_match[] = {
- { "LOON0011" },
+ { .id = "LOON0011" },
{ }
};
MODULE_DEVICE_TABLE(acpi, loongson_se_acpi_match);
diff --git a/drivers/mfd/upboard-fpga.c b/drivers/mfd/upboard-fpga.c
index 9a9599dcb0a1..6674f4a1d2fe 100644
--- a/drivers/mfd/upboard-fpga.c
+++ b/drivers/mfd/upboard-fpga.c
@@ -300,8 +300,8 @@ static int upboard_fpga_probe(struct platform_device *pdev)
}
static const struct acpi_device_id upboard_fpga_acpi_match[] = {
- { "AANT0F01", (kernel_ulong_t)&upboard_up2_fpga_data },
- { "AANT0F04", (kernel_ulong_t)&upboard_up_fpga_data },
+ { .id = "AANT0F01", .driver_data = (kernel_ulong_t)&upboard_up2_fpga_data },
+ { .id = "AANT0F04", .driver_data = (kernel_ulong_t)&upboard_up_fpga_data },
{}
};
MODULE_DEVICE_TABLE(acpi, upboard_fpga_acpi_match);
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH v4 10/20] mfd: Use named initializers for acpi_device_id arrays
2026-11-10 21:54 ` [PATCH v4 10/20] mfd: Use named initializers for acpi_device_id arrays Uwe Kleine-König (The Capable Hub)
@ 2026-11-11 8:45 ` Andy Shevchenko
2026-11-11 9:55 ` Uwe Kleine-König (The Capable Hub)
0 siblings, 1 reply; 29+ messages in thread
From: Andy Shevchenko @ 2026-11-11 8:45 UTC (permalink / raw)
To: Uwe Kleine-König (The Capable Hub)
Cc: Lee Jones, David Rhodes, Richard Fitzgerald, Mika Westerberg,
Zha Qipeng, Qunqin Zhao, Thomas Richard, linux-sound, patches,
mfd, linux-kernel, linux-crypto, Charles Keepax, Linus Walleij
On Tue, Nov 10, 2026 at 10:54:35PM +0100, Uwe Kleine-König (The Capable Hub) wrote:
> While being less compact, using named initializers allows to more easily
> see which members of the structs are assigned which value without having
> to lookup the declaration of the struct. And it's also more robust
> against changes to the struct definition.
>
> The mentioned robustness is relevant for a planned change to struct
> acpi_device_id that replaces .driver_data by an anonymous union.
>
> This patch doesn't modify the compiled arrays, only their representation
> in source form benefits.
I don't know who is the first, you, guys, collaborate together and come up with
a solution, but I have reviewed already this
https://lore.kernel.org/lkml/20261104-acpi-mfd-v2-0-64b9dee3baaf@thegoodpenguin.co.uk/
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH v4 10/20] mfd: Use named initializers for acpi_device_id arrays
2026-11-11 8:45 ` Andy Shevchenko
@ 2026-11-11 9:55 ` Uwe Kleine-König (The Capable Hub)
0 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-11 9:55 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Lee Jones, David Rhodes, Richard Fitzgerald, Mika Westerberg,
Zha Qipeng, Qunqin Zhao, Thomas Richard, linux-sound, patches,
mfd, linux-kernel, linux-crypto, Charles Keepax, Linus Walleij,
Pawel Zalewski
[-- Attachment #1: Type: text/plain, Size: 1909 bytes --]
[adding Pawel to Cc:]
Hello Andy,
On Wed, Nov 11, 2026 at 10:45:47AM +0200, Andy Shevchenko wrote:
> On Tue, Nov 10, 2026 at 10:54:35PM +0100, Uwe Kleine-König (The Capable Hub) wrote:
> > While being less compact, using named initializers allows to more easily
> > see which members of the structs are assigned which value without having
> > to lookup the declaration of the struct. And it's also more robust
> > against changes to the struct definition.
> >
> > The mentioned robustness is relevant for a planned change to struct
> > acpi_device_id that replaces .driver_data by an anonymous union.
> >
> > This patch doesn't modify the compiled arrays, only their representation
> > in source form benefits.
>
> I don't know who is the first, you, guys, collaborate together and come up with
> a solution, but I have reviewed already this
> https://lore.kernel.org/lkml/20261104-acpi-mfd-v2-0-64b9dee3baaf@thegoodpenguin.co.uk/
Oh, I wasn't aware that Pawel is still on that. Initially we had a list
where Pawel indeed was assigned for acpi_device_id. Since then I went on
to do these changes per subsystem for several *_device_id at once
(instead of per *_device_id and subsystem) and stopped looking after the
initial list. I might have mentioned that in our internal chat, but I
take the blame on the lack of coordination.
Looking through the differences I found:
- different commit log
- I have a cleanup to drivers/mfd/kempld-core.c which conflicts with
Pawel's series
@Lee: If you take Pawel's series, I can rebase and resend. Most of my
patches still apply just fine on top of Pawel's series, so you can
preempt parts of my rebase using
b4 am -P 1,2,4-6,8,9,11-15,17-20 cover.1794347059.git.u.kleine-koenig@baylibre.com
Just give me a poke when you made up your mind how to proceed and sorry
for missing that conflict.
Best regards
Uwe
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v4 11/20] mfd: intel-m10-bmc-pmci: Use named initializers for dfl_device_id array
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (9 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 10/20] mfd: Use named initializers for acpi_device_id arrays Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 12/20] mfd: Use named initializers for arrays of i2c_device_id Uwe Kleine-König (The Capable Hub)
` (8 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones; +Cc: Xu Yilun, Tom Rix, mfd, linux-kernel, Linus Walleij
While being less compact, using named initializers allows to more easily
see which members of the structs are assigned which value without having
to lookup the declaration of the struct. And it's also more robust
against changes to the struct definition.
The mentioned robustness is relevant for a planned change to struct
dfl_device_id that replaces .driver_data by an anonymous union.
This patch doesn't modify the compiled array, only its representation
in source form benefits.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/intel-m10-bmc-pmci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/intel-m10-bmc-pmci.c b/drivers/mfd/intel-m10-bmc-pmci.c
index d213c6ec04ba..f78309bbabfd 100644
--- a/drivers/mfd/intel-m10-bmc-pmci.c
+++ b/drivers/mfd/intel-m10-bmc-pmci.c
@@ -434,7 +434,7 @@ static void m10bmc_pmci_remove(struct dfl_device *ddev)
#define FME_FEATURE_ID_M10BMC_PMCI 0x12
static const struct dfl_device_id m10bmc_pmci_ids[] = {
- { FME_ID, FME_FEATURE_ID_M10BMC_PMCI },
+ { .type = FME_ID, .feature_id = FME_FEATURE_ID_M10BMC_PMCI },
{ }
};
MODULE_DEVICE_TABLE(dfl, m10bmc_pmci_ids);
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* [PATCH v4 12/20] mfd: Use named initializers for arrays of i2c_device_id
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (10 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 11/20] mfd: intel-m10-bmc-pmci: Use named initializers for dfl_device_id array Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 13/20] mfd: twl6030: Use named initializers for of_device_id Uwe Kleine-König (The Capable Hub)
` (7 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones
Cc: Michael Hennerich, Chen-Yu Tsai, Marek Vasut, James Ogletree,
Fred Treven, Ben Bright, Support Opensource, Andy Shevchenko,
Charles Keepax, Richard Fitzgerald, Chanwoo Choi,
Krzysztof Kozlowski, André Draszik, Aaro Koskinen,
Andreas Kemnade, Kevin Hilman, Roger Quadros, Tony Lindgren,
Andreas Werner, Samuel Kayode, Maxime Coquelin, Alexandre Torgue,
mfd, linux-kernel, patches, linux-renesas-soc, linux-sound,
linux-omap, imx, linux-stm32, linux-arm-kernel, Linus Walleij
While being less compact, using named initializers allows to more easily
see which members of the structs are assigned which value without having
to lookup the declaration of the struct. And it's also more robust
against changes to the struct definition.
The mentioned robustness is relevant for a planned change to struct
i2c_device_id that replaces .driver_data by an anonymous union.
This patch doesn't modify the compiled arrays, only their representation
in source form benefits.
Reviewed-by: André Draszik <andre.draszik@linaro.org> # for Maxim MAX77759
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/88pm800.c | 2 +-
drivers/mfd/88pm805.c | 2 +-
drivers/mfd/88pm860x-core.c | 2 +-
drivers/mfd/aat2870-core.c | 2 +-
drivers/mfd/act8945a.c | 2 +-
drivers/mfd/adp5520.c | 4 ++--
drivers/mfd/arizona-i2c.c | 12 ++++++------
drivers/mfd/as3722.c | 2 +-
drivers/mfd/axp20x-i2c.c | 22 +++++++++++-----------
drivers/mfd/bcm590xx.c | 4 ++--
drivers/mfd/bd9571mwv.c | 2 +-
drivers/mfd/bq257xx.c | 4 ++--
drivers/mfd/cs40l50-i2c.c | 2 +-
drivers/mfd/da903x.c | 4 ++--
drivers/mfd/da9052-i2c.c | 10 +++++-----
drivers/mfd/da9055-i2c.c | 2 +-
drivers/mfd/da9062-core.c | 4 ++--
drivers/mfd/da9063-i2c.c | 4 ++--
drivers/mfd/da9150-core.c | 2 +-
drivers/mfd/intel_soc_pmic_crc.c | 2 +-
drivers/mfd/lm3533-core.c | 2 +-
drivers/mfd/lp3943.c | 2 +-
drivers/mfd/lp873x.c | 2 +-
drivers/mfd/lp87565.c | 2 +-
drivers/mfd/lp8788.c | 2 +-
drivers/mfd/madera-i2c.c | 18 +++++++++---------
drivers/mfd/max14577.c | 4 ++--
drivers/mfd/max77541.c | 4 ++--
drivers/mfd/max77620.c | 6 +++---
drivers/mfd/max77693.c | 2 +-
drivers/mfd/max77759.c | 2 +-
drivers/mfd/max77843.c | 2 +-
drivers/mfd/max8907.c | 2 +-
drivers/mfd/max8925-i2c.c | 2 +-
drivers/mfd/max8997.c | 4 ++--
drivers/mfd/max8998.c | 4 ++--
drivers/mfd/menelaus.c | 2 +-
drivers/mfd/menf21bmc.c | 2 +-
drivers/mfd/palmas.c | 8 ++++----
drivers/mfd/pf1550.c | 2 +-
drivers/mfd/retu-mfd.c | 4 ++--
drivers/mfd/rsmu_i2c.c | 14 +++++++-------
drivers/mfd/rt5033.c | 2 +-
drivers/mfd/si476x-i2c.c | 6 +++---
drivers/mfd/sky81452.c | 2 +-
drivers/mfd/stmpe-i2c.c | 16 ++++++++--------
drivers/mfd/stw481x.c | 2 +-
drivers/mfd/tc3589x.c | 14 +++++++-------
drivers/mfd/ti-lmu.c | 10 +++++-----
drivers/mfd/tps6105x.c | 4 ++--
drivers/mfd/tps65010.c | 10 +++++-----
drivers/mfd/tps6507x.c | 2 +-
drivers/mfd/tps65086.c | 2 +-
drivers/mfd/tps65090.c | 2 +-
drivers/mfd/tps65217.c | 2 +-
drivers/mfd/tps65218.c | 4 ++--
drivers/mfd/tps6586x.c | 2 +-
drivers/mfd/tps65910.c | 4 ++--
drivers/mfd/tps65912-i2c.c | 2 +-
drivers/mfd/twl-core.c | 22 +++++++++++-----------
drivers/mfd/twl6040.c | 4 ++--
drivers/mfd/wm831x-i2c.c | 14 +++++++-------
drivers/mfd/wm8350-i2c.c | 6 +++---
drivers/mfd/wm8400-core.c | 2 +-
drivers/mfd/wm8994-core.c | 8 ++++----
65 files changed, 162 insertions(+), 162 deletions(-)
diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c
index 7f3e312b8f73..0e5c6b20943f 100644
--- a/drivers/mfd/88pm800.c
+++ b/drivers/mfd/88pm800.c
@@ -116,7 +116,7 @@ enum {
#define PM800_CHIP_GEN_ID_NUM 0x3
static const struct i2c_device_id pm80x_id_table[] = {
- { "88PM800" },
+ { .name = "88PM800" },
{} /* NULL terminated */
};
MODULE_DEVICE_TABLE(i2c, pm80x_id_table);
diff --git a/drivers/mfd/88pm805.c b/drivers/mfd/88pm805.c
index f5d6663172ee..2eb3380a5207 100644
--- a/drivers/mfd/88pm805.c
+++ b/drivers/mfd/88pm805.c
@@ -30,7 +30,7 @@
#include <linux/delay.h>
static const struct i2c_device_id pm80x_id_table[] = {
- { "88PM805" },
+ { .name = "88PM805" },
{} /* NULL terminated */
};
MODULE_DEVICE_TABLE(i2c, pm80x_id_table);
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index 77230fbe07be..1b201ad129c2 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -1232,7 +1232,7 @@ static int pm860x_resume(struct device *dev)
static DEFINE_SIMPLE_DEV_PM_OPS(pm860x_pm_ops, pm860x_suspend, pm860x_resume);
static const struct i2c_device_id pm860x_id_table[] = {
- { "88PM860x" },
+ { .name = "88PM860x" },
{}
};
MODULE_DEVICE_TABLE(i2c, pm860x_id_table);
diff --git a/drivers/mfd/aat2870-core.c b/drivers/mfd/aat2870-core.c
index 0d56cd6fbc6a..c172b40f64c3 100644
--- a/drivers/mfd/aat2870-core.c
+++ b/drivers/mfd/aat2870-core.c
@@ -437,7 +437,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(aat2870_pm_ops, aat2870_i2c_suspend,
aat2870_i2c_resume);
static const struct i2c_device_id aat2870_i2c_id_table[] = {
- { "aat2870" },
+ { .name = "aat2870" },
{ }
};
diff --git a/drivers/mfd/act8945a.c b/drivers/mfd/act8945a.c
index cafefb4451cb..bb1b4e4fb288 100644
--- a/drivers/mfd/act8945a.c
+++ b/drivers/mfd/act8945a.c
@@ -54,7 +54,7 @@ static int act8945a_i2c_probe(struct i2c_client *i2c)
}
static const struct i2c_device_id act8945a_i2c_id[] = {
- { "act8945a" },
+ { .name = "act8945a" },
{}
};
MODULE_DEVICE_TABLE(i2c, act8945a_i2c_id);
diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c
index bd6f4965ebc8..a4b58f431f92 100644
--- a/drivers/mfd/adp5520.c
+++ b/drivers/mfd/adp5520.c
@@ -329,8 +329,8 @@ static int adp5520_resume(struct device *dev)
static DEFINE_SIMPLE_DEV_PM_OPS(adp5520_pm, adp5520_suspend, adp5520_resume);
static const struct i2c_device_id adp5520_id[] = {
- { "pmic-adp5520", ID_ADP5520 },
- { "pmic-adp5501", ID_ADP5501 },
+ { .name = "pmic-adp5520", .driver_data = ID_ADP5520 },
+ { .name = "pmic-adp5501", .driver_data = ID_ADP5501 },
{ }
};
diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c
index 10e76fc8f12e..1ea8a59948b6 100644
--- a/drivers/mfd/arizona-i2c.c
+++ b/drivers/mfd/arizona-i2c.c
@@ -85,12 +85,12 @@ static void arizona_i2c_remove(struct i2c_client *i2c)
}
static const struct i2c_device_id arizona_i2c_id[] = {
- { "wm5102", WM5102 },
- { "wm5110", WM5110 },
- { "wm8280", WM8280 },
- { "wm8997", WM8997 },
- { "wm8998", WM8998 },
- { "wm1814", WM1814 },
+ { .name = "wm5102", .driver_data = WM5102 },
+ { .name = "wm5110", .driver_data = WM5110 },
+ { .name = "wm8280", .driver_data = WM8280 },
+ { .name = "wm8997", .driver_data = WM8997 },
+ { .name = "wm8998", .driver_data = WM8998 },
+ { .name = "wm1814", .driver_data = WM1814 },
{ }
};
MODULE_DEVICE_TABLE(i2c, arizona_i2c_id);
diff --git a/drivers/mfd/as3722.c b/drivers/mfd/as3722.c
index 7ab6fcc9c27c..2f58709ffd9a 100644
--- a/drivers/mfd/as3722.c
+++ b/drivers/mfd/as3722.c
@@ -432,7 +432,7 @@ static const struct of_device_id as3722_of_match[] = {
MODULE_DEVICE_TABLE(of, as3722_of_match);
static const struct i2c_device_id as3722_i2c_id[] = {
- { "as3722" },
+ { .name = "as3722" },
{}
};
MODULE_DEVICE_TABLE(i2c, as3722_i2c_id);
diff --git a/drivers/mfd/axp20x-i2c.c b/drivers/mfd/axp20x-i2c.c
index 5c93136f977e..2f595e2b883c 100644
--- a/drivers/mfd/axp20x-i2c.c
+++ b/drivers/mfd/axp20x-i2c.c
@@ -76,17 +76,17 @@ MODULE_DEVICE_TABLE(of, axp20x_i2c_of_match);
#endif
static const struct i2c_device_id axp20x_i2c_id[] = {
- { "axp152" },
- { "axp192" },
- { "axp202" },
- { "axp209" },
- { "axp221" },
- { "axp223" },
- { "axp313a" },
- { "axp717" },
- { "axp803" },
- { "axp806" },
- { "axp15060" },
+ { .name = "axp152" },
+ { .name = "axp192" },
+ { .name = "axp202" },
+ { .name = "axp209" },
+ { .name = "axp221" },
+ { .name = "axp223" },
+ { .name = "axp313a" },
+ { .name = "axp717" },
+ { .name = "axp803" },
+ { .name = "axp806" },
+ { .name = "axp15060" },
{ }
};
MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
diff --git a/drivers/mfd/bcm590xx.c b/drivers/mfd/bcm590xx.c
index 5a8456bbd63f..85a906b54541 100644
--- a/drivers/mfd/bcm590xx.c
+++ b/drivers/mfd/bcm590xx.c
@@ -160,8 +160,8 @@ static const struct of_device_id bcm590xx_of_match[] = {
MODULE_DEVICE_TABLE(of, bcm590xx_of_match);
static const struct i2c_device_id bcm590xx_i2c_id[] = {
- { "bcm59054" },
- { "bcm59056" },
+ { .name = "bcm59054" },
+ { .name = "bcm59056" },
{ }
};
MODULE_DEVICE_TABLE(i2c, bcm590xx_i2c_id);
diff --git a/drivers/mfd/bd9571mwv.c b/drivers/mfd/bd9571mwv.c
index db8c2963fb48..2b6fe6fd9806 100644
--- a/drivers/mfd/bd9571mwv.c
+++ b/drivers/mfd/bd9571mwv.c
@@ -268,7 +268,7 @@ static const struct of_device_id bd9571mwv_of_match_table[] = {
MODULE_DEVICE_TABLE(of, bd9571mwv_of_match_table);
static const struct i2c_device_id bd9571mwv_id_table[] = {
- { "bd9571mwv" },
+ { .name = "bd9571mwv" },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(i2c, bd9571mwv_id_table);
diff --git a/drivers/mfd/bq257xx.c b/drivers/mfd/bq257xx.c
index 01f5fc97f538..5310337fe9d4 100644
--- a/drivers/mfd/bq257xx.c
+++ b/drivers/mfd/bq257xx.c
@@ -129,8 +129,8 @@ static int bq257xx_probe(struct i2c_client *client)
}
static const struct i2c_device_id bq257xx_i2c_ids[] = {
- { "bq25703a", BQ25703A },
- { "bq25792", BQ25792 },
+ { .name = "bq25703a", .driver_data = BQ25703A },
+ { .name = "bq25792", .driver_data = BQ25792 },
{}
};
MODULE_DEVICE_TABLE(i2c, bq257xx_i2c_ids);
diff --git a/drivers/mfd/cs40l50-i2c.c b/drivers/mfd/cs40l50-i2c.c
index 639be743d956..6043eb6639b5 100644
--- a/drivers/mfd/cs40l50-i2c.c
+++ b/drivers/mfd/cs40l50-i2c.c
@@ -40,7 +40,7 @@ static void cs40l50_i2c_remove(struct i2c_client *i2c)
}
static const struct i2c_device_id cs40l50_id_i2c[] = {
- { "cs40l50" },
+ { .name = "cs40l50" },
{}
};
MODULE_DEVICE_TABLE(i2c, cs40l50_id_i2c);
diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c
index e4ad48e1f139..64c7ea0b5d2b 100644
--- a/drivers/mfd/da903x.c
+++ b/drivers/mfd/da903x.c
@@ -447,8 +447,8 @@ static const struct da903x_chip_ops da903x_ops[] = {
};
static const struct i2c_device_id da903x_id_table[] = {
- { "da9030", 0 },
- { "da9034", 1 },
+ { .name = "da9030", .driver_data = 0 },
+ { .name = "da9034", .driver_data = 1 },
{ },
};
MODULE_DEVICE_TABLE(i2c, da903x_id_table);
diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c
index fd000a21bcba..b75cfe805d5e 100644
--- a/drivers/mfd/da9052-i2c.c
+++ b/drivers/mfd/da9052-i2c.c
@@ -103,11 +103,11 @@ static int da9052_i2c_disable_multiwrite(struct da9052 *da9052)
}
static const struct i2c_device_id da9052_i2c_id[] = {
- {"da9052", DA9052},
- {"da9053-aa", DA9053_AA},
- {"da9053-ba", DA9053_BA},
- {"da9053-bb", DA9053_BB},
- {"da9053-bc", DA9053_BC},
+ { .name = "da9052", .driver_data = DA9052 },
+ { .name = "da9053-aa", .driver_data = DA9053_AA },
+ { .name = "da9053-ba", .driver_data = DA9053_BA },
+ { .name = "da9053-bb", .driver_data = DA9053_BB },
+ { .name = "da9053-bc", .driver_data = DA9053_BC },
{}
};
MODULE_DEVICE_TABLE(i2c, da9052_i2c_id);
diff --git a/drivers/mfd/da9055-i2c.c b/drivers/mfd/da9055-i2c.c
index 6c1981832aaf..e85db66f79a1 100644
--- a/drivers/mfd/da9055-i2c.c
+++ b/drivers/mfd/da9055-i2c.c
@@ -54,7 +54,7 @@ static void da9055_i2c_remove(struct i2c_client *i2c)
* and CODEC, which must be different to operate together.
*/
static const struct i2c_device_id da9055_i2c_id[] = {
- { "da9055-pmic" },
+ { .name = "da9055-pmic" },
{ }
};
MODULE_DEVICE_TABLE(i2c, da9055_i2c_id);
diff --git a/drivers/mfd/da9062-core.c b/drivers/mfd/da9062-core.c
index ad198183aff7..a825b0c42e4c 100644
--- a/drivers/mfd/da9062-core.c
+++ b/drivers/mfd/da9062-core.c
@@ -711,8 +711,8 @@ static const struct of_device_id da9062_dt_ids[] = {
MODULE_DEVICE_TABLE(of, da9062_dt_ids);
static const struct i2c_device_id da9062_i2c_id[] = {
- { "da9061", COMPAT_TYPE_DA9061 },
- { "da9062", COMPAT_TYPE_DA9062 },
+ { .name = "da9061", .driver_data = COMPAT_TYPE_DA9061 },
+ { .name = "da9062", .driver_data = COMPAT_TYPE_DA9062 },
{ }
};
MODULE_DEVICE_TABLE(i2c, da9062_i2c_id);
diff --git a/drivers/mfd/da9063-i2c.c b/drivers/mfd/da9063-i2c.c
index a803b7440f09..b57a6ee90aa9 100644
--- a/drivers/mfd/da9063-i2c.c
+++ b/drivers/mfd/da9063-i2c.c
@@ -476,8 +476,8 @@ static int da9063_i2c_probe(struct i2c_client *i2c)
}
static const struct i2c_device_id da9063_i2c_id[] = {
- { "da9063", PMIC_TYPE_DA9063 },
- { "da9063l", PMIC_TYPE_DA9063L },
+ { .name = "da9063", .driver_data = PMIC_TYPE_DA9063 },
+ { .name = "da9063l", .driver_data = PMIC_TYPE_DA9063L },
{},
};
MODULE_DEVICE_TABLE(i2c, da9063_i2c_id);
diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c
index 19325d72a27e..74ae7638c211 100644
--- a/drivers/mfd/da9150-core.c
+++ b/drivers/mfd/da9150-core.c
@@ -498,7 +498,7 @@ static void da9150_shutdown(struct i2c_client *client)
}
static const struct i2c_device_id da9150_i2c_id[] = {
- { "da9150", },
+ { .name = "da9150" },
{ }
};
MODULE_DEVICE_TABLE(i2c, da9150_i2c_id);
diff --git a/drivers/mfd/intel_soc_pmic_crc.c b/drivers/mfd/intel_soc_pmic_crc.c
index d3db727c08de..c1c02700ef08 100644
--- a/drivers/mfd/intel_soc_pmic_crc.c
+++ b/drivers/mfd/intel_soc_pmic_crc.c
@@ -258,7 +258,7 @@ static const struct acpi_device_id crystal_cove_acpi_match[] = {
MODULE_DEVICE_TABLE(acpi, crystal_cove_acpi_match);
static const struct i2c_device_id crystal_cove_i2c_match[] = {
- { "intel_soc_pmic_crc" },
+ { .name = "intel_soc_pmic_crc" },
{ }
};
MODULE_DEVICE_TABLE(i2c, crystal_cove_i2c_match);
diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
index 9233da7ce099..4b94e30100f7 100644
--- a/drivers/mfd/lm3533-core.c
+++ b/drivers/mfd/lm3533-core.c
@@ -502,7 +502,7 @@ static const struct of_device_id lm3533_match_table[] = {
MODULE_DEVICE_TABLE(of, lm3533_match_table);
static const struct i2c_device_id lm3533_i2c_ids[] = {
- { "lm3533" },
+ { .name = "lm3533" },
{ }
};
MODULE_DEVICE_TABLE(i2c, lm3533_i2c_ids);
diff --git a/drivers/mfd/lp3943.c b/drivers/mfd/lp3943.c
index 1918b5c7a5e7..c6465bbf41fa 100644
--- a/drivers/mfd/lp3943.c
+++ b/drivers/mfd/lp3943.c
@@ -126,7 +126,7 @@ static int lp3943_probe(struct i2c_client *cl)
}
static const struct i2c_device_id lp3943_ids[] = {
- { "lp3943" },
+ { .name = "lp3943" },
{ }
};
MODULE_DEVICE_TABLE(i2c, lp3943_ids);
diff --git a/drivers/mfd/lp873x.c b/drivers/mfd/lp873x.c
index d2c90302bf59..46444696f2f4 100644
--- a/drivers/mfd/lp873x.c
+++ b/drivers/mfd/lp873x.c
@@ -67,7 +67,7 @@ static const struct of_device_id of_lp873x_match_table[] = {
MODULE_DEVICE_TABLE(of, of_lp873x_match_table);
static const struct i2c_device_id lp873x_id_table[] = {
- { "lp873x" },
+ { .name = "lp873x" },
{ }
};
MODULE_DEVICE_TABLE(i2c, lp873x_id_table);
diff --git a/drivers/mfd/lp87565.c b/drivers/mfd/lp87565.c
index efea1ba82811..14e80588efac 100644
--- a/drivers/mfd/lp87565.c
+++ b/drivers/mfd/lp87565.c
@@ -108,7 +108,7 @@ static void lp87565_shutdown(struct i2c_client *client)
}
static const struct i2c_device_id lp87565_id_table[] = {
- { "lp87565-q1" },
+ { .name = "lp87565-q1" },
{ }
};
MODULE_DEVICE_TABLE(i2c, lp87565_id_table);
diff --git a/drivers/mfd/lp8788.c b/drivers/mfd/lp8788.c
index 32f255378f5a..48fe99a2b982 100644
--- a/drivers/mfd/lp8788.c
+++ b/drivers/mfd/lp8788.c
@@ -216,7 +216,7 @@ static void lp8788_remove(struct i2c_client *cl)
}
static const struct i2c_device_id lp8788_ids[] = {
- { "lp8788" },
+ { .name = "lp8788" },
{ }
};
MODULE_DEVICE_TABLE(i2c, lp8788_ids);
diff --git a/drivers/mfd/madera-i2c.c b/drivers/mfd/madera-i2c.c
index 0986e4a99f4a..762f668ed20c 100644
--- a/drivers/mfd/madera-i2c.c
+++ b/drivers/mfd/madera-i2c.c
@@ -112,15 +112,15 @@ static void madera_i2c_remove(struct i2c_client *i2c)
}
static const struct i2c_device_id madera_i2c_id[] = {
- { "cs47l15", CS47L15 },
- { "cs47l35", CS47L35 },
- { "cs47l85", CS47L85 },
- { "cs47l90", CS47L90 },
- { "cs47l91", CS47L91 },
- { "cs42l92", CS42L92 },
- { "cs47l92", CS47L92 },
- { "cs47l93", CS47L93 },
- { "wm1840", WM1840 },
+ { .name = "cs47l15", .driver_data = CS47L15 },
+ { .name = "cs47l35", .driver_data = CS47L35 },
+ { .name = "cs47l85", .driver_data = CS47L85 },
+ { .name = "cs47l90", .driver_data = CS47L90 },
+ { .name = "cs47l91", .driver_data = CS47L91 },
+ { .name = "cs42l92", .driver_data = CS42L92 },
+ { .name = "cs47l92", .driver_data = CS47L92 },
+ { .name = "cs47l93", .driver_data = CS47L93 },
+ { .name = "wm1840", .driver_data = WM1840 },
{ }
};
MODULE_DEVICE_TABLE(i2c, madera_i2c_id);
diff --git a/drivers/mfd/max14577.c b/drivers/mfd/max14577.c
index da275a04a1ef..f3325d015ec6 100644
--- a/drivers/mfd/max14577.c
+++ b/drivers/mfd/max14577.c
@@ -463,8 +463,8 @@ static void max14577_i2c_remove(struct i2c_client *i2c)
}
static const struct i2c_device_id max14577_i2c_id[] = {
- { "max14577", MAXIM_DEVICE_TYPE_MAX14577, },
- { "max77836", MAXIM_DEVICE_TYPE_MAX77836, },
+ { .name = "max14577", .driver_data = MAXIM_DEVICE_TYPE_MAX14577 },
+ { .name = "max77836", .driver_data = MAXIM_DEVICE_TYPE_MAX77836 },
{ }
};
MODULE_DEVICE_TABLE(i2c, max14577_i2c_id);
diff --git a/drivers/mfd/max77541.c b/drivers/mfd/max77541.c
index f91b4f5373ce..5f5b2ff181d3 100644
--- a/drivers/mfd/max77541.c
+++ b/drivers/mfd/max77541.c
@@ -199,8 +199,8 @@ static const struct of_device_id max77541_of_id[] = {
MODULE_DEVICE_TABLE(of, max77541_of_id);
static const struct i2c_device_id max77541_id[] = {
- { "max77540", MAX77540 },
- { "max77541", MAX77541 },
+ { .name = "max77540", .driver_data = MAX77540 },
+ { .name = "max77541", .driver_data = MAX77541 },
{ }
};
MODULE_DEVICE_TABLE(i2c, max77541_id);
diff --git a/drivers/mfd/max77620.c b/drivers/mfd/max77620.c
index c4f89a9681f3..a66ca73997f5 100644
--- a/drivers/mfd/max77620.c
+++ b/drivers/mfd/max77620.c
@@ -694,9 +694,9 @@ static int max77620_i2c_resume(struct device *dev)
}
static const struct i2c_device_id max77620_id[] = {
- {"max77620", MAX77620},
- {"max20024", MAX20024},
- {"max77663", MAX77663},
+ { .name = "max77620", .driver_data = MAX77620 },
+ { .name = "max20024", .driver_data = MAX20024 },
+ { .name = "max77663", .driver_data = MAX77663 },
{},
};
diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
index 1c485a4c3dcf..411011afde37 100644
--- a/drivers/mfd/max77693.c
+++ b/drivers/mfd/max77693.c
@@ -306,7 +306,7 @@ static void max77693_i2c_remove(struct i2c_client *i2c)
}
static const struct i2c_device_id max77693_i2c_id[] = {
- { "max77693", TYPE_MAX77693 },
+ { .name = "max77693", .driver_data = TYPE_MAX77693 },
{ }
};
MODULE_DEVICE_TABLE(i2c, max77693_i2c_id);
diff --git a/drivers/mfd/max77759.c b/drivers/mfd/max77759.c
index 72b608a1ab3f..2347eb0b014b 100644
--- a/drivers/mfd/max77759.c
+++ b/drivers/mfd/max77759.c
@@ -712,7 +712,7 @@ static int max77759_probe(struct i2c_client *client)
}
static const struct i2c_device_id max77759_i2c_id[] = {
- { "max77759" },
+ { .name = "max77759" },
{ }
};
MODULE_DEVICE_TABLE(i2c, max77759_i2c_id);
diff --git a/drivers/mfd/max77843.c b/drivers/mfd/max77843.c
index 9ae6715642ae..d3224cf5e3f6 100644
--- a/drivers/mfd/max77843.c
+++ b/drivers/mfd/max77843.c
@@ -169,7 +169,7 @@ static const struct of_device_id max77843_dt_match[] = {
};
static const struct i2c_device_id max77843_id[] = {
- { "max77843", TYPE_MAX77843, },
+ { .name = "max77843", .driver_data = TYPE_MAX77843 },
{ },
};
diff --git a/drivers/mfd/max8907.c b/drivers/mfd/max8907.c
index 7bac1d651771..70ffc08a96d1 100644
--- a/drivers/mfd/max8907.c
+++ b/drivers/mfd/max8907.c
@@ -300,7 +300,7 @@ MODULE_DEVICE_TABLE(of, max8907_of_match);
#endif
static const struct i2c_device_id max8907_i2c_id[] = {
- { "max8907" },
+ { .name = "max8907" },
{}
};
MODULE_DEVICE_TABLE(i2c, max8907_i2c_id);
diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
index ab19ff0c7867..25390d0eabd4 100644
--- a/drivers/mfd/max8925-i2c.c
+++ b/drivers/mfd/max8925-i2c.c
@@ -127,7 +127,7 @@ EXPORT_SYMBOL(max8925_set_bits);
static const struct i2c_device_id max8925_id_table[] = {
- { "max8925" },
+ { .name = "max8925" },
{ }
};
diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index 7ba8ed1dfde3..6edc18e0eebb 100644
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -229,8 +229,8 @@ static int max8997_i2c_probe(struct i2c_client *i2c)
}
static const struct i2c_device_id max8997_i2c_id[] = {
- { "max8997", TYPE_MAX8997 },
- { "max8966", TYPE_MAX8966 },
+ { .name = "max8997", .driver_data = TYPE_MAX8997 },
+ { .name = "max8966", .driver_data = TYPE_MAX8966 },
{ }
};
diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index 5032eab05bb4..c5d03c74227d 100644
--- a/drivers/mfd/max8998.c
+++ b/drivers/mfd/max8998.c
@@ -223,8 +223,8 @@ static int max8998_i2c_probe(struct i2c_client *i2c)
}
static const struct i2c_device_id max8998_i2c_id[] = {
- { "max8998", TYPE_MAX8998 },
- { "lp3974", TYPE_LP3974},
+ { .name = "max8998", .driver_data = TYPE_MAX8998 },
+ { .name = "lp3974", .driver_data = TYPE_LP3974 },
{ }
};
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index a125d40fa121..22da12dbab8b 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -1230,7 +1230,7 @@ static void menelaus_remove(struct i2c_client *client)
}
static const struct i2c_device_id menelaus_id[] = {
- { "menelaus" },
+ { .name = "menelaus" },
{ }
};
MODULE_DEVICE_TABLE(i2c, menelaus_id);
diff --git a/drivers/mfd/menf21bmc.c b/drivers/mfd/menf21bmc.c
index 0f24de516d72..b2577f9e1e04 100644
--- a/drivers/mfd/menf21bmc.c
+++ b/drivers/mfd/menf21bmc.c
@@ -101,7 +101,7 @@ menf21bmc_probe(struct i2c_client *client)
}
static const struct i2c_device_id menf21bmc_id_table[] = {
- { "menf21bmc" },
+ { .name = "menf21bmc" },
{ }
};
MODULE_DEVICE_TABLE(i2c, menf21bmc_id_table);
diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index 7fc886f4f80e..26faecab1af3 100644
--- a/drivers/mfd/palmas.c
+++ b/drivers/mfd/palmas.c
@@ -699,10 +699,10 @@ static const struct of_device_id of_palmas_match_tbl[] = {
MODULE_DEVICE_TABLE(of, of_palmas_match_tbl);
static const struct i2c_device_id palmas_i2c_id[] = {
- { "palmas", (kernel_ulong_t)&palmas_data },
- { "twl6035", (kernel_ulong_t)&palmas_data },
- { "twl6037", (kernel_ulong_t)&palmas_data },
- { "tps65913", (kernel_ulong_t)&palmas_data },
+ { .name = "palmas", .driver_data = (kernel_ulong_t)&palmas_data },
+ { .name = "twl6035", .driver_data = (kernel_ulong_t)&palmas_data },
+ { .name = "twl6037", .driver_data = (kernel_ulong_t)&palmas_data },
+ { .name = "tps65913", .driver_data = (kernel_ulong_t)&palmas_data },
{ /* end */ }
};
MODULE_DEVICE_TABLE(i2c, palmas_i2c_id);
diff --git a/drivers/mfd/pf1550.c b/drivers/mfd/pf1550.c
index c4f567c05564..7c3348ad59dc 100644
--- a/drivers/mfd/pf1550.c
+++ b/drivers/mfd/pf1550.c
@@ -340,7 +340,7 @@ static int pf1550_resume(struct device *dev)
static DEFINE_SIMPLE_DEV_PM_OPS(pf1550_pm, pf1550_suspend, pf1550_resume);
static const struct i2c_device_id pf1550_i2c_id[] = {
- { "pf1550" },
+ { .name = "pf1550" },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(i2c, pf1550_i2c_id);
diff --git a/drivers/mfd/retu-mfd.c b/drivers/mfd/retu-mfd.c
index 1d43458b4938..330366224e80 100644
--- a/drivers/mfd/retu-mfd.c
+++ b/drivers/mfd/retu-mfd.c
@@ -300,8 +300,8 @@ static void retu_remove(struct i2c_client *i2c)
}
static const struct i2c_device_id retu_id[] = {
- { "retu" },
- { "tahvo" },
+ { .name = "retu" },
+ { .name = "tahvo" },
{ }
};
MODULE_DEVICE_TABLE(i2c, retu_id);
diff --git a/drivers/mfd/rsmu_i2c.c b/drivers/mfd/rsmu_i2c.c
index c57795ed20f4..d05aaf576a86 100644
--- a/drivers/mfd/rsmu_i2c.c
+++ b/drivers/mfd/rsmu_i2c.c
@@ -328,13 +328,13 @@ static void rsmu_i2c_remove(struct i2c_client *client)
}
static const struct i2c_device_id rsmu_i2c_id[] = {
- { "8a34000", RSMU_CM },
- { "8a34001", RSMU_CM },
- { "8a34002", RSMU_CM },
- { "82p33810", RSMU_SABRE },
- { "82p33811", RSMU_SABRE },
- { "8v19n850", RSMU_SL },
- { "8v19n851", RSMU_SL },
+ { .name = "8a34000", .driver_data = RSMU_CM },
+ { .name = "8a34001", .driver_data = RSMU_CM },
+ { .name = "8a34002", .driver_data = RSMU_CM },
+ { .name = "82p33810", .driver_data = RSMU_SABRE },
+ { .name = "82p33811", .driver_data = RSMU_SABRE },
+ { .name = "8v19n850", .driver_data = RSMU_SL },
+ { .name = "8v19n851", .driver_data = RSMU_SL },
{}
};
MODULE_DEVICE_TABLE(i2c, rsmu_i2c_id);
diff --git a/drivers/mfd/rt5033.c b/drivers/mfd/rt5033.c
index 072fd4447245..799661fb1c72 100644
--- a/drivers/mfd/rt5033.c
+++ b/drivers/mfd/rt5033.c
@@ -107,7 +107,7 @@ static int rt5033_i2c_probe(struct i2c_client *i2c)
}
static const struct i2c_device_id rt5033_i2c_id[] = {
- { "rt5033", },
+ { .name = "rt5033" },
{ }
};
MODULE_DEVICE_TABLE(i2c, rt5033_i2c_id);
diff --git a/drivers/mfd/si476x-i2c.c b/drivers/mfd/si476x-i2c.c
index 6351aef2d3bb..549f64255eef 100644
--- a/drivers/mfd/si476x-i2c.c
+++ b/drivers/mfd/si476x-i2c.c
@@ -838,9 +838,9 @@ static void si476x_core_remove(struct i2c_client *client)
static const struct i2c_device_id si476x_id[] = {
- { "si4761", SI476X_CHIP_SI4761 },
- { "si4764", SI476X_CHIP_SI4764 },
- { "si4768", SI476X_CHIP_SI4768 },
+ { .name = "si4761", .driver_data = SI476X_CHIP_SI4761 },
+ { .name = "si4764", .driver_data = SI476X_CHIP_SI4764 },
+ { .name = "si4768", .driver_data = SI476X_CHIP_SI4768 },
{ },
};
MODULE_DEVICE_TABLE(i2c, si476x_id);
diff --git a/drivers/mfd/sky81452.c b/drivers/mfd/sky81452.c
index 771b62a5c70f..8a213176b7cd 100644
--- a/drivers/mfd/sky81452.c
+++ b/drivers/mfd/sky81452.c
@@ -59,7 +59,7 @@ static int sky81452_probe(struct i2c_client *client)
}
static const struct i2c_device_id sky81452_ids[] = {
- { "sky81452" },
+ { .name = "sky81452" },
{ }
};
MODULE_DEVICE_TABLE(i2c, sky81452_ids);
diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
index 943fa363efc3..8eee780afa16 100644
--- a/drivers/mfd/stmpe-i2c.c
+++ b/drivers/mfd/stmpe-i2c.c
@@ -100,14 +100,14 @@ static void stmpe_i2c_remove(struct i2c_client *i2c)
}
static const struct i2c_device_id stmpe_i2c_id[] = {
- { "stmpe610", STMPE610 },
- { "stmpe801", STMPE801 },
- { "stmpe811", STMPE811 },
- { "stmpe1600", STMPE1600 },
- { "stmpe1601", STMPE1601 },
- { "stmpe1801", STMPE1801 },
- { "stmpe2401", STMPE2401 },
- { "stmpe2403", STMPE2403 },
+ { .name = "stmpe610", .driver_data = STMPE610 },
+ { .name = "stmpe801", .driver_data = STMPE801 },
+ { .name = "stmpe811", .driver_data = STMPE811 },
+ { .name = "stmpe1600", .driver_data = STMPE1600 },
+ { .name = "stmpe1601", .driver_data = STMPE1601 },
+ { .name = "stmpe1801", .driver_data = STMPE1801 },
+ { .name = "stmpe2401", .driver_data = STMPE2401 },
+ { .name = "stmpe2403", .driver_data = STMPE2403 },
{ }
};
MODULE_DEVICE_TABLE(i2c, stmpe_i2c_id);
diff --git a/drivers/mfd/stw481x.c b/drivers/mfd/stw481x.c
index 5ed64d53c23d..da1e293d36e9 100644
--- a/drivers/mfd/stw481x.c
+++ b/drivers/mfd/stw481x.c
@@ -222,7 +222,7 @@ static int stw481x_probe(struct i2c_client *client)
* the structure of the I2C core.
*/
static const struct i2c_device_id stw481x_id[] = {
- { "stw481x" },
+ { .name = "stw481x" },
{ }
};
MODULE_DEVICE_TABLE(i2c, stw481x_id);
diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
index 2d4eb771e230..f812e7551f09 100644
--- a/drivers/mfd/tc3589x.c
+++ b/drivers/mfd/tc3589x.c
@@ -466,13 +466,13 @@ static DEFINE_SIMPLE_DEV_PM_OPS(tc3589x_dev_pm_ops,
tc3589x_suspend, tc3589x_resume);
static const struct i2c_device_id tc3589x_id[] = {
- { "tc35890", TC3589X_TC35890 },
- { "tc35892", TC3589X_TC35892 },
- { "tc35893", TC3589X_TC35893 },
- { "tc35894", TC3589X_TC35894 },
- { "tc35895", TC3589X_TC35895 },
- { "tc35896", TC3589X_TC35896 },
- { "tc3589x", TC3589X_UNKNOWN },
+ { .name = "tc35890", .driver_data = TC3589X_TC35890 },
+ { .name = "tc35892", .driver_data = TC3589X_TC35892 },
+ { .name = "tc35893", .driver_data = TC3589X_TC35893 },
+ { .name = "tc35894", .driver_data = TC3589X_TC35894 },
+ { .name = "tc35895", .driver_data = TC3589X_TC35895 },
+ { .name = "tc35896", .driver_data = TC3589X_TC35896 },
+ { .name = "tc3589x", .driver_data = TC3589X_UNKNOWN },
{ }
};
MODULE_DEVICE_TABLE(i2c, tc3589x_id);
diff --git a/drivers/mfd/ti-lmu.c b/drivers/mfd/ti-lmu.c
index cfc9f88b9842..5d22830b010f 100644
--- a/drivers/mfd/ti-lmu.c
+++ b/drivers/mfd/ti-lmu.c
@@ -206,11 +206,11 @@ static const struct of_device_id ti_lmu_of_match[] = {
MODULE_DEVICE_TABLE(of, ti_lmu_of_match);
static const struct i2c_device_id ti_lmu_ids[] = {
- { "lm3631", LM3631 },
- { "lm3632", LM3632 },
- { "lm3633", LM3633 },
- { "lm3695", LM3695 },
- { "lm36274", LM36274 },
+ { .name = "lm3631", .driver_data = LM3631 },
+ { .name = "lm3632", .driver_data = LM3632 },
+ { .name = "lm3633", .driver_data = LM3633 },
+ { .name = "lm3695", .driver_data = LM3695 },
+ { .name = "lm36274", .driver_data = LM36274 },
{ }
};
MODULE_DEVICE_TABLE(i2c, ti_lmu_ids);
diff --git a/drivers/mfd/tps6105x.c b/drivers/mfd/tps6105x.c
index b11cd2c03311..032ac8ad026a 100644
--- a/drivers/mfd/tps6105x.c
+++ b/drivers/mfd/tps6105x.c
@@ -191,8 +191,8 @@ static void tps6105x_remove(struct i2c_client *client)
}
static const struct i2c_device_id tps6105x_id[] = {
- { "tps61050" },
- { "tps61052" },
+ { .name = "tps61050" },
+ { .name = "tps61052" },
{ }
};
MODULE_DEVICE_TABLE(i2c, tps6105x_id);
diff --git a/drivers/mfd/tps65010.c b/drivers/mfd/tps65010.c
index 8a144ec52201..4d428b82def9 100644
--- a/drivers/mfd/tps65010.c
+++ b/drivers/mfd/tps65010.c
@@ -649,11 +649,11 @@ static int tps65010_probe(struct i2c_client *client)
}
static const struct i2c_device_id tps65010_id[] = {
- { "tps65010", TPS65010 },
- { "tps65011", TPS65011 },
- { "tps65012", TPS65012 },
- { "tps65013", TPS65013 },
- { "tps65014", TPS65011 }, /* tps65011 charging at 6.5V max */
+ { .name = "tps65010", .driver_data = TPS65010 },
+ { .name = "tps65011", .driver_data = TPS65011 },
+ { .name = "tps65012", .driver_data = TPS65012 },
+ { .name = "tps65013", .driver_data = TPS65013 },
+ { .name = "tps65014", .driver_data = TPS65011 }, /* tps65011 charging at 6.5V max */
{ }
};
MODULE_DEVICE_TABLE(i2c, tps65010_id);
diff --git a/drivers/mfd/tps6507x.c b/drivers/mfd/tps6507x.c
index 9865512dc7cc..ed806754d89f 100644
--- a/drivers/mfd/tps6507x.c
+++ b/drivers/mfd/tps6507x.c
@@ -103,7 +103,7 @@ static int tps6507x_i2c_probe(struct i2c_client *i2c)
}
static const struct i2c_device_id tps6507x_i2c_id[] = {
- { "tps6507x" },
+ { .name = "tps6507x" },
{ }
};
MODULE_DEVICE_TABLE(i2c, tps6507x_i2c_id);
diff --git a/drivers/mfd/tps65086.c b/drivers/mfd/tps65086.c
index 54832e9321b9..a73e0b5c0982 100644
--- a/drivers/mfd/tps65086.c
+++ b/drivers/mfd/tps65086.c
@@ -127,7 +127,7 @@ static void tps65086_remove(struct i2c_client *client)
}
static const struct i2c_device_id tps65086_id_table[] = {
- { "tps65086" },
+ { .name = "tps65086" },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(i2c, tps65086_id_table);
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
index 24f42175a9b4..ae845be3a8ea 100644
--- a/drivers/mfd/tps65090.c
+++ b/drivers/mfd/tps65090.c
@@ -225,7 +225,7 @@ static int tps65090_i2c_probe(struct i2c_client *client)
static const struct i2c_device_id tps65090_id_table[] = {
- { "tps65090" },
+ { .name = "tps65090" },
{ }
};
diff --git a/drivers/mfd/tps65217.c b/drivers/mfd/tps65217.c
index 569c28c8b20f..e9560a5445b9 100644
--- a/drivers/mfd/tps65217.c
+++ b/drivers/mfd/tps65217.c
@@ -418,7 +418,7 @@ static int tps65217_probe(struct i2c_client *client)
}
static const struct i2c_device_id tps65217_id_table[] = {
- {"tps65217", TPS65217},
+ { .name = "tps65217", .driver_data = TPS65217 },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(i2c, tps65217_id_table);
diff --git a/drivers/mfd/tps65218.c b/drivers/mfd/tps65218.c
index 4f3e632f726f..d2d39bd7eddd 100644
--- a/drivers/mfd/tps65218.c
+++ b/drivers/mfd/tps65218.c
@@ -336,8 +336,8 @@ static int tps65218_probe(struct i2c_client *client)
}
static const struct i2c_device_id tps65218_id_table[] = {
- { "tps65218", TPS65218 },
- { },
+ { .name = "tps65218", .driver_data = TPS65218 },
+ { }
};
MODULE_DEVICE_TABLE(i2c, tps65218_id_table);
diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index 600186b1e8cb..e58a50d601dd 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -642,7 +642,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(tps6586x_pm_ops, tps6586x_i2c_suspend,
tps6586x_i2c_resume);
static const struct i2c_device_id tps6586x_id_table[] = {
- { "tps6586x" },
+ { .name = "tps6586x" },
{ }
};
MODULE_DEVICE_TABLE(i2c, tps6586x_id_table);
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index 6243b66b1b6f..b0dbee3e6ea2 100644
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -532,8 +532,8 @@ static int tps65910_i2c_probe(struct i2c_client *i2c)
}
static const struct i2c_device_id tps65910_i2c_id[] = {
- { "tps65910", TPS65910 },
- { "tps65911", TPS65911 },
+ { .name = "tps65910", .driver_data = TPS65910 },
+ { .name = "tps65911", .driver_data = TPS65911 },
{ }
};
diff --git a/drivers/mfd/tps65912-i2c.c b/drivers/mfd/tps65912-i2c.c
index 138e50497b51..3eca8880532e 100644
--- a/drivers/mfd/tps65912-i2c.c
+++ b/drivers/mfd/tps65912-i2c.c
@@ -43,7 +43,7 @@ static int tps65912_i2c_probe(struct i2c_client *client)
}
static const struct i2c_device_id tps65912_i2c_id_table[] = {
- { "tps65912" },
+ { .name = "tps65912" },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(i2c, tps65912_i2c_id_table);
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 7fbce76efd30..fac44a0059f5 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -933,17 +933,17 @@ static int twl_resume(struct device *dev)
static DEFINE_SIMPLE_DEV_PM_OPS(twl_dev_pm_ops, twl_suspend, twl_resume);
static const struct i2c_device_id twl_ids[] = {
- { "twl4030", TWL4030_VAUX2 }, /* "Triton 2" */
- { "twl5030", 0 }, /* T2 updated */
- { "twl5031", TWL5031 }, /* TWL5030 updated */
- { "tps65950", 0 }, /* catalog version of twl5030 */
- { "tps65930", TPS_SUBSET }, /* fewer LDOs and DACs; no charger */
- { "tps65920", TPS_SUBSET }, /* fewer LDOs; no codec or charger */
- { "tps65921", TPS_SUBSET }, /* fewer LDOs; no codec, no LED
- and vibrator. Charger in USB module*/
- { "twl6030", TWL6030_CLASS }, /* "Phoenix power chip" */
- { "twl6032", TWL6030_CLASS | TWL6032_SUBCLASS }, /* "Phoenix lite" */
- { /* end of list */ },
+ { .name = "twl4030", .driver_data = TWL4030_VAUX2 }, /* "Triton 2" */
+ { .name = "twl5030", .driver_data = 0 }, /* T2 updated */
+ { .name = "twl5031", .driver_data = TWL5031 }, /* TWL5030 updated */
+ { .name = "tps65950", .driver_data = 0 }, /* catalog version of twl5030 */
+ { .name = "tps65930", .driver_data = TPS_SUBSET }, /* fewer LDOs and DACs; no charger */
+ { .name = "tps65920", .driver_data = TPS_SUBSET }, /* fewer LDOs; no codec or charger */
+ { .name = "tps65921", .driver_data = TPS_SUBSET }, /* fewer LDOs; no codec, no LED
+ and vibrator. Charger in USB module*/
+ { .name = "twl6030", .driver_data = TWL6030_CLASS }, /* "Phoenix power chip" */
+ { .name = "twl6032", .driver_data = TWL6030_CLASS | TWL6032_SUBCLASS }, /* "Phoenix lite" */
+ { /* end of list */ }
};
/* One Client Driver , 4 Clients */
diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c
index 562a0f939f6e..ed2a2cca8cb9 100644
--- a/drivers/mfd/twl6040.c
+++ b/drivers/mfd/twl6040.c
@@ -817,8 +817,8 @@ static void twl6040_remove(struct i2c_client *client)
}
static const struct i2c_device_id twl6040_i2c_id[] = {
- { "twl6040" },
- { "twl6041" },
+ { .name = "twl6040" },
+ { .name = "twl6041" },
{ }
};
MODULE_DEVICE_TABLE(i2c, twl6040_i2c_id);
diff --git a/drivers/mfd/wm831x-i2c.c b/drivers/mfd/wm831x-i2c.c
index 9bee007f9c99..5a093086021a 100644
--- a/drivers/mfd/wm831x-i2c.c
+++ b/drivers/mfd/wm831x-i2c.c
@@ -72,13 +72,13 @@ static int wm831x_i2c_poweroff(struct device *dev)
}
static const struct i2c_device_id wm831x_i2c_id[] = {
- { "wm8310", WM8310 },
- { "wm8311", WM8311 },
- { "wm8312", WM8312 },
- { "wm8320", WM8320 },
- { "wm8321", WM8321 },
- { "wm8325", WM8325 },
- { "wm8326", WM8326 },
+ { .name = "wm8310", .driver_data = WM8310 },
+ { .name = "wm8311", .driver_data = WM8311 },
+ { .name = "wm8312", .driver_data = WM8312 },
+ { .name = "wm8320", .driver_data = WM8320 },
+ { .name = "wm8321", .driver_data = WM8321 },
+ { .name = "wm8325", .driver_data = WM8325 },
+ { .name = "wm8326", .driver_data = WM8326 },
{ }
};
diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c
index 767c176b12a7..b20761a88b05 100644
--- a/drivers/mfd/wm8350-i2c.c
+++ b/drivers/mfd/wm8350-i2c.c
@@ -41,9 +41,9 @@ static int wm8350_i2c_probe(struct i2c_client *i2c)
}
static const struct i2c_device_id wm8350_i2c_id[] = {
- { "wm8350" },
- { "wm8351" },
- { "wm8352" },
+ { .name = "wm8350" },
+ { .name = "wm8351" },
+ { .name = "wm8352" },
{ }
};
diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c
index 8ecfe878a5ba..1c0ba450ef9b 100644
--- a/drivers/mfd/wm8400-core.c
+++ b/drivers/mfd/wm8400-core.c
@@ -135,7 +135,7 @@ static int wm8400_i2c_probe(struct i2c_client *i2c)
}
static const struct i2c_device_id wm8400_i2c_id[] = {
- { "wm8400" },
+ { .name = "wm8400" },
{ }
};
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 094c0b3dbd97..903d7070dbe5 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -643,10 +643,10 @@ static void wm8994_i2c_remove(struct i2c_client *i2c)
}
static const struct i2c_device_id wm8994_i2c_id[] = {
- { "wm1811", WM1811 },
- { "wm1811a", WM1811 },
- { "wm8994", WM8994 },
- { "wm8958", WM8958 },
+ { .name = "wm1811", .driver_data = WM1811 },
+ { .name = "wm1811a", .driver_data = WM1811 },
+ { .name = "wm8994", .driver_data = WM8994 },
+ { .name = "wm8958", .driver_data = WM8958 },
{ }
};
MODULE_DEVICE_TABLE(i2c, wm8994_i2c_id);
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* [PATCH v4 13/20] mfd: twl6030: Use named initializers for of_device_id
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (11 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 12/20] mfd: Use named initializers for arrays of i2c_device_id Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 14/20] mfd: Use PCI_DEVICE* macros to initialize pci_device_id arrays Uwe Kleine-König (The Capable Hub)
` (6 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones
Cc: Aaro Koskinen, Andreas Kemnade, Kevin Hilman, Roger Quadros,
Tony Lindgren, linux-omap, mfd, linux-kernel, Linus Walleij
For .compatible a named initializer was already used, unify by also
doing that for the .data member.
This is easier readable for a human and more robust against changes to
the struct definition. This robustness is relevant for a planned change
to struct of_device_id that replaces .driver_data by an anonymous union.
This patch doesn't modify the compiled array, only its representation
in source form benefits.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/twl6030-irq.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index 0ca00f618d4d..4303fb288dd5 100644
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -283,8 +283,8 @@ static const struct irq_domain_ops twl6030_irq_domain_ops = {
};
static const struct of_device_id twl6030_of_match[] __maybe_unused = {
- {.compatible = "ti,twl6030", &twl6030_interrupt_mapping},
- {.compatible = "ti,twl6032", &twl6032_interrupt_mapping},
+ { .compatible = "ti,twl6030", .data = &twl6030_interrupt_mapping },
+ { .compatible = "ti,twl6032", .data = &twl6032_interrupt_mapping },
{ },
};
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* [PATCH v4 14/20] mfd: Use PCI_DEVICE* macros to initialize pci_device_id arrays
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (12 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 13/20] mfd: twl6030: Use named initializers for of_device_id Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 15/20] mfd: Use named initializers for platform_device_id array Uwe Kleine-König (The Capable Hub)
` (5 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones; +Cc: mfd, linux-kernel, Linus Walleij
pci_device_id entries are usually initialized using these PCI_DEVICE*
macros. Adapt to this more usual style.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/ioc3.c | 2 +-
drivers/mfd/janz-cmodio.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/mfd/ioc3.c b/drivers/mfd/ioc3.c
index 5f8ac364b610..bf2be3bc8602 100644
--- a/drivers/mfd/ioc3.c
+++ b/drivers/mfd/ioc3.c
@@ -654,7 +654,7 @@ static void ioc3_mfd_remove(struct pci_dev *pdev)
}
static struct pci_device_id ioc3_mfd_id_table[] = {
- { PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3, PCI_ANY_ID, PCI_ANY_ID },
+ { PCI_DEVICE(PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3) },
{ 0, },
};
MODULE_DEVICE_TABLE(pci, ioc3_mfd_id_table);
diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
index add3bc04185b..93e1c04bddd6 100644
--- a/drivers/mfd/janz-cmodio.c
+++ b/drivers/mfd/janz-cmodio.c
@@ -259,12 +259,12 @@ static void cmodio_pci_remove(struct pci_dev *dev)
/* The list of devices that this module will support */
static const struct pci_device_id cmodio_pci_ids[] = {
- { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_JANZ, 0x0101 },
- { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_JANZ, 0x0100 },
- { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_JANZ, 0x0201 },
- { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_JANZ, 0x0202 },
- { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_JANZ, 0x0201 },
- { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_JANZ, 0x0202 },
+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_JANZ, 0x0101) },
+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_JANZ, 0x0100) },
+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_JANZ, 0x0201) },
+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_JANZ, 0x0202) },
+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_JANZ, 0x0201) },
+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_JANZ, 0x0202) },
{ 0, }
};
MODULE_DEVICE_TABLE(pci, cmodio_pci_ids);
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* [PATCH v4 15/20] mfd: Use named initializers for platform_device_id array
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (13 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 14/20] mfd: Use PCI_DEVICE* macros to initialize pci_device_id arrays Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 23:07 ` Benson Leung
2026-11-10 21:54 ` [PATCH v4 16/20] mfd: Unify style of acpi_device_id arrays Uwe Kleine-König (The Capable Hub)
` (4 subsequent siblings)
19 siblings, 1 reply; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones
Cc: Linus Walleij, Benson Leung, Guenter Roeck, Matthias Brugger,
AngeloGioacchino Del Regno, linux-arm-kernel, mfd, linux-kernel,
chrome-platform, linux-mediatek
While being less compact, using named initializers allows to more easily
see which members of the structs are assigned which value without having
to lookup the declaration of the struct. And it's also more robust
against changes to the struct definition.
The mentioned robustness is relevant for a planned change to struct
platform_device_id that replaces .driver_data by an anonymous union.
This patch doesn't modify the compiled arrays, only their representation
in source form benefits.
Also drop a tailing comma after a list terminator to match the common
style for these device-id arrays.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/ab8500-core.c | 8 ++++----
drivers/mfd/cros_ec_dev.c | 2 +-
drivers/mfd/mt6397-core.c | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index d5602b2f4a0e..8638fc8472f7 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -1252,10 +1252,10 @@ static int ab8500_probe(struct platform_device *pdev)
}
static const struct platform_device_id ab8500_id[] = {
- { "ab8500-core", AB8500_VERSION_AB8500 },
- { "ab8505-core", AB8500_VERSION_AB8505 },
- { "ab9540-i2c", AB8500_VERSION_AB9540 },
- { "ab8540-i2c", AB8500_VERSION_AB8540 },
+ { .name = "ab8500-core", .driver_data = AB8500_VERSION_AB8500 },
+ { .name = "ab8505-core", .driver_data = AB8500_VERSION_AB8505 },
+ { .name = "ab9540-i2c", .driver_data = AB8500_VERSION_AB9540 },
+ { .name = "ab8540-i2c", .driver_data = AB8500_VERSION_AB8540 },
{ }
};
diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index 96aac158fd8b..3c7e7f1efd0f 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -379,7 +379,7 @@ static void ec_device_remove(struct platform_device *pdev)
}
static const struct platform_device_id cros_ec_id[] = {
- { DRV_NAME },
+ { .name = DRV_NAME },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(platform, cros_ec_id);
diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
index e74936ac206f..385121867da5 100644
--- a/drivers/mfd/mt6397-core.c
+++ b/drivers/mfd/mt6397-core.c
@@ -435,8 +435,8 @@ static const struct of_device_id mt6397_of_match[] = {
MODULE_DEVICE_TABLE(of, mt6397_of_match);
static const struct platform_device_id mt6397_id[] = {
- { "mt6397" },
- { },
+ { .name = "mt6397" },
+ { }
};
MODULE_DEVICE_TABLE(platform, mt6397_id);
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH v4 15/20] mfd: Use named initializers for platform_device_id array
2026-11-10 21:54 ` [PATCH v4 15/20] mfd: Use named initializers for platform_device_id array Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 23:07 ` Benson Leung
0 siblings, 0 replies; 29+ messages in thread
From: Benson Leung @ 2026-11-10 23:07 UTC (permalink / raw)
To: Uwe Kleine-König (The Capable Hub)
Cc: Lee Jones, Linus Walleij, Benson Leung, Guenter Roeck,
Matthias Brugger, AngeloGioacchino Del Regno, linux-arm-kernel,
mfd, linux-kernel, chrome-platform, linux-mediatek
[-- Attachment #1: Type: text/plain, Size: 2893 bytes --]
On Tue, Nov 10, 2026 at 10:54:40PM +0100, Uwe Kleine-König (The Capable Hub) wrote:
> While being less compact, using named initializers allows to more easily
> see which members of the structs are assigned which value without having
> to lookup the declaration of the struct. And it's also more robust
> against changes to the struct definition.
>
> The mentioned robustness is relevant for a planned change to struct
> platform_device_id that replaces .driver_data by an anonymous union.
>
> This patch doesn't modify the compiled arrays, only their representation
> in source form benefits.
>
> Also drop a tailing comma after a list terminator to match the common
> style for these device-id arrays.
>
> Reviewed-by: Linus Walleij <linusw@kernel.org>
> Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Reviewed-by: Benson Leung <bleung@chromium.org>
> ---
> drivers/mfd/ab8500-core.c | 8 ++++----
> drivers/mfd/cros_ec_dev.c | 2 +-
> drivers/mfd/mt6397-core.c | 4 ++--
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
> index d5602b2f4a0e..8638fc8472f7 100644
> --- a/drivers/mfd/ab8500-core.c
> +++ b/drivers/mfd/ab8500-core.c
> @@ -1252,10 +1252,10 @@ static int ab8500_probe(struct platform_device *pdev)
> }
>
> static const struct platform_device_id ab8500_id[] = {
> - { "ab8500-core", AB8500_VERSION_AB8500 },
> - { "ab8505-core", AB8500_VERSION_AB8505 },
> - { "ab9540-i2c", AB8500_VERSION_AB9540 },
> - { "ab8540-i2c", AB8500_VERSION_AB8540 },
> + { .name = "ab8500-core", .driver_data = AB8500_VERSION_AB8500 },
> + { .name = "ab8505-core", .driver_data = AB8500_VERSION_AB8505 },
> + { .name = "ab9540-i2c", .driver_data = AB8500_VERSION_AB9540 },
> + { .name = "ab8540-i2c", .driver_data = AB8500_VERSION_AB8540 },
> { }
> };
>
> diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
> index 96aac158fd8b..3c7e7f1efd0f 100644
> --- a/drivers/mfd/cros_ec_dev.c
> +++ b/drivers/mfd/cros_ec_dev.c
> @@ -379,7 +379,7 @@ static void ec_device_remove(struct platform_device *pdev)
> }
>
> static const struct platform_device_id cros_ec_id[] = {
> - { DRV_NAME },
> + { .name = DRV_NAME },
> { /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(platform, cros_ec_id);
> diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
> index e74936ac206f..385121867da5 100644
> --- a/drivers/mfd/mt6397-core.c
> +++ b/drivers/mfd/mt6397-core.c
> @@ -435,8 +435,8 @@ static const struct of_device_id mt6397_of_match[] = {
> MODULE_DEVICE_TABLE(of, mt6397_of_match);
>
> static const struct platform_device_id mt6397_id[] = {
> - { "mt6397" },
> - { },
> + { .name = "mt6397" },
> + { }
> };
> MODULE_DEVICE_TABLE(platform, mt6397_id);
>
> --
> 2.56.0.rc1
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v4 16/20] mfd: Unify style of acpi_device_id arrays
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (14 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 15/20] mfd: Use named initializers for platform_device_id array Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 17/20] mfd: Unify style of dmi_system_id arrays Uwe Kleine-König (The Capable Hub)
` (3 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones
Cc: Chen-Yu Tsai, David Rhodes, Richard Fitzgerald, Andy Shevchenko,
Thomas Richard, mfd, linux-kernel, linux-sound, patches,
Charles Keepax, Linus Walleij
Update the various acpi_device_id arrays to conform to the most used and
generally recommended coding style. That is:
- no comma after the list terminator;
- a comma after an initializer if (and only if) the closing } is not
directly following;
- no explicit zeros in the list terminator;
- a space after an opening { and before a closing }, a single space in
the list terminator;
Adapt the few offenders accordingly.
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/axp20x-i2c.c | 2 +-
drivers/mfd/cs42l43-i2c.c | 2 +-
drivers/mfd/intel_soc_pmic_chtdc_ti.c | 2 +-
drivers/mfd/intel_soc_pmic_crc.c | 2 +-
drivers/mfd/intel_soc_pmic_mrfld.c | 2 +-
drivers/mfd/kempld-core.c | 2 +-
drivers/mfd/upboard-fpga.c | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/mfd/axp20x-i2c.c b/drivers/mfd/axp20x-i2c.c
index 2f595e2b883c..57695e46e00e 100644
--- a/drivers/mfd/axp20x-i2c.c
+++ b/drivers/mfd/axp20x-i2c.c
@@ -97,7 +97,7 @@ static const struct acpi_device_id axp20x_i2c_acpi_match[] = {
.id = "INT33F4",
.driver_data = AXP288_ID,
},
- { },
+ { }
};
MODULE_DEVICE_TABLE(acpi, axp20x_i2c_acpi_match);
#endif
diff --git a/drivers/mfd/cs42l43-i2c.c b/drivers/mfd/cs42l43-i2c.c
index faf4fc6b3d73..89dca295cc57 100644
--- a/drivers/mfd/cs42l43-i2c.c
+++ b/drivers/mfd/cs42l43-i2c.c
@@ -76,7 +76,7 @@ static const struct acpi_device_id cs42l43_acpi_match[] = {
{ .id = "CSC4243", .driver_data = CS42L43_DEVID_VAL },
{ .id = "CSC2A3B", .driver_data = CS42L43B_DEVID_VAL },
{ .id = "CSC4244", .driver_data = CS42L43B_DEVID_VAL },
- {}
+ { }
};
MODULE_DEVICE_TABLE(acpi, cs42l43_acpi_match);
#endif
diff --git a/drivers/mfd/intel_soc_pmic_chtdc_ti.c b/drivers/mfd/intel_soc_pmic_chtdc_ti.c
index ff6223d6f54b..49f4138961c8 100644
--- a/drivers/mfd/intel_soc_pmic_chtdc_ti.c
+++ b/drivers/mfd/intel_soc_pmic_chtdc_ti.c
@@ -163,7 +163,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(chtdc_ti_pm_ops, chtdc_ti_suspend, chtdc_ti_resu
static const struct acpi_device_id chtdc_ti_acpi_ids[] = {
{ .id = "INT33F5" },
- { },
+ { }
};
MODULE_DEVICE_TABLE(acpi, chtdc_ti_acpi_ids);
diff --git a/drivers/mfd/intel_soc_pmic_crc.c b/drivers/mfd/intel_soc_pmic_crc.c
index c1c02700ef08..95588caa2e77 100644
--- a/drivers/mfd/intel_soc_pmic_crc.c
+++ b/drivers/mfd/intel_soc_pmic_crc.c
@@ -253,7 +253,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(crystal_cove_pm_ops, crystal_cove_suspend, cryst
static const struct acpi_device_id crystal_cove_acpi_match[] = {
{ .id = "INT33FD" },
- { },
+ { }
};
MODULE_DEVICE_TABLE(acpi, crystal_cove_acpi_match);
diff --git a/drivers/mfd/intel_soc_pmic_mrfld.c b/drivers/mfd/intel_soc_pmic_mrfld.c
index 9d7e1881d693..531d8b8be44d 100644
--- a/drivers/mfd/intel_soc_pmic_mrfld.c
+++ b/drivers/mfd/intel_soc_pmic_mrfld.c
@@ -140,7 +140,7 @@ static int bcove_probe(struct platform_device *pdev)
static const struct acpi_device_id bcove_acpi_ids[] = {
{ .id = "INTC100E" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(acpi, bcove_acpi_ids);
diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
index 71b226a57204..ceef894efcca 100644
--- a/drivers/mfd/kempld-core.c
+++ b/drivers/mfd/kempld-core.c
@@ -440,7 +440,7 @@ static void kempld_remove(struct platform_device *pdev)
static const struct acpi_device_id kempld_acpi_table[] = {
{ .id = "KEM0000" },
{ .id = "KEM0001" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(acpi, kempld_acpi_table);
diff --git a/drivers/mfd/upboard-fpga.c b/drivers/mfd/upboard-fpga.c
index 6674f4a1d2fe..37c3c50aa6e4 100644
--- a/drivers/mfd/upboard-fpga.c
+++ b/drivers/mfd/upboard-fpga.c
@@ -302,7 +302,7 @@ static int upboard_fpga_probe(struct platform_device *pdev)
static const struct acpi_device_id upboard_fpga_acpi_match[] = {
{ .id = "AANT0F01", .driver_data = (kernel_ulong_t)&upboard_up2_fpga_data },
{ .id = "AANT0F04", .driver_data = (kernel_ulong_t)&upboard_up_fpga_data },
- {}
+ { }
};
MODULE_DEVICE_TABLE(acpi, upboard_fpga_acpi_match);
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* [PATCH v4 17/20] mfd: Unify style of dmi_system_id arrays
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (15 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 16/20] mfd: Unify style of acpi_device_id arrays Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 18/20] mfd: Unify style of i2c_device_id arrays Uwe Kleine-König (The Capable Hub)
` (2 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones; +Cc: Thomas Richard, mfd, linux-kernel, linux, Linus Walleij
These arrays already mostly match the most used and generally
recommended coding style. That is:
- no comma after the list terminator;
- a comma after an initializer if (and only if) the closing } is not
directly following;
- no explicit zeros in the list terminator;
- a space after an opening { and before a closing }, a single space in
the list terminator;
Only the list terminators didn't match this style as they didn't use a
space.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/cgbc-core.c | 2 +-
drivers/mfd/intel_quark_i2c_gpio.c | 2 +-
drivers/mfd/kempld-core.c | 2 +-
drivers/mfd/tqmx86.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/cgbc-core.c b/drivers/mfd/cgbc-core.c
index 2becaf797646..e32c709edbac 100644
--- a/drivers/mfd/cgbc-core.c
+++ b/drivers/mfd/cgbc-core.c
@@ -393,7 +393,7 @@ static const struct dmi_system_id cgbc_dmi_table[] __initconst = {
DMI_MATCH(DMI_BOARD_NAME, "conga-SA8"),
},
},
- {}
+ { }
};
MODULE_DEVICE_TABLE(dmi, cgbc_dmi_table);
diff --git a/drivers/mfd/intel_quark_i2c_gpio.c b/drivers/mfd/intel_quark_i2c_gpio.c
index 443a1a0cf777..7f8c16d82738 100644
--- a/drivers/mfd/intel_quark_i2c_gpio.c
+++ b/drivers/mfd/intel_quark_i2c_gpio.c
@@ -74,7 +74,7 @@ static const struct dmi_system_id dmi_platform_info[] = {
},
.driver_data = (void *)&intel_quark_i2c_controller_fast_node,
},
- {}
+ { }
};
/* This is used as a place holder and will be modified at run-time */
diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
index ceef894efcca..3f6a863dccd9 100644
--- a/drivers/mfd/kempld-core.c
+++ b/drivers/mfd/kempld-core.c
@@ -737,7 +737,7 @@ static const struct dmi_system_id kempld_dmi_table[] __initconst = {
DMI_MATCH(DMI_BOARD_NAME, "Qseven-Q7AL"),
},
},
- {}
+ { }
};
MODULE_DEVICE_TABLE(dmi, kempld_dmi_table);
diff --git a/drivers/mfd/tqmx86.c b/drivers/mfd/tqmx86.c
index 1c2fe3f91238..16f47566cf3c 100644
--- a/drivers/mfd/tqmx86.c
+++ b/drivers/mfd/tqmx86.c
@@ -338,7 +338,7 @@ static const struct dmi_system_id tqmx86_dmi_table[] __initconst = {
},
.callback = tqmx86_create_platform_device,
},
- {}
+ { }
};
MODULE_DEVICE_TABLE(dmi, tqmx86_dmi_table);
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* [PATCH v4 18/20] mfd: Unify style of i2c_device_id arrays
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (16 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 17/20] mfd: Unify style of dmi_system_id arrays Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 19/20] mfd: Unify style of of_device_id arrays Uwe Kleine-König (The Capable Hub)
2026-11-10 21:54 ` [PATCH v4 20/20] mfd: Unify style of pci_device_id arrays Uwe Kleine-König (The Capable Hub)
19 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones
Cc: James Ogletree, Fred Treven, Ben Bright, Support Opensource,
Chanwoo Choi, Krzysztof Kozlowski, Aaro Koskinen,
Andreas Kemnade, Kevin Hilman, Roger Quadros, Tony Lindgren, mfd,
linux-kernel, patches, linux-omap, Charles Keepax, Linus Walleij
Most of these arrays already mostly match the most used and
generally recommended coding style. That is:
- no comma after the list terminator;
- a comma after an initializer if (and only if) the closing } is not
directly following;
- no explicit zeros in the list terminator;
- a space after an opening { and before a closing }, a single space in
the list terminator;
Adapt the few offenders accordingly and also use tabs for indention for
two drivers.
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/88pm800.c | 2 +-
drivers/mfd/88pm805.c | 2 +-
drivers/mfd/88pm860x-core.c | 2 +-
drivers/mfd/act8945a.c | 2 +-
drivers/mfd/as3711.c | 2 +-
drivers/mfd/as3722.c | 2 +-
drivers/mfd/bq257xx.c | 2 +-
drivers/mfd/cs40l50-i2c.c | 2 +-
drivers/mfd/da903x.c | 2 +-
drivers/mfd/da9052-i2c.c | 2 +-
drivers/mfd/da9063-i2c.c | 2 +-
drivers/mfd/max77620.c | 2 +-
drivers/mfd/max77843.c | 2 +-
drivers/mfd/max8907.c | 2 +-
drivers/mfd/rc5t583.c | 2 +-
drivers/mfd/rsmu_i2c.c | 2 +-
drivers/mfd/si476x-i2c.c | 2 +-
drivers/mfd/tps65910.c | 6 +++---
drivers/mfd/wm8400-core.c | 4 ++--
19 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c
index 0e5c6b20943f..0f209084e8d3 100644
--- a/drivers/mfd/88pm800.c
+++ b/drivers/mfd/88pm800.c
@@ -117,7 +117,7 @@ enum {
static const struct i2c_device_id pm80x_id_table[] = {
{ .name = "88PM800" },
- {} /* NULL terminated */
+ { } /* NULL terminated */
};
MODULE_DEVICE_TABLE(i2c, pm80x_id_table);
diff --git a/drivers/mfd/88pm805.c b/drivers/mfd/88pm805.c
index 2eb3380a5207..8df11233bc4c 100644
--- a/drivers/mfd/88pm805.c
+++ b/drivers/mfd/88pm805.c
@@ -31,7 +31,7 @@
static const struct i2c_device_id pm80x_id_table[] = {
{ .name = "88PM805" },
- {} /* NULL terminated */
+ { } /* NULL terminated */
};
MODULE_DEVICE_TABLE(i2c, pm80x_id_table);
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index 1b201ad129c2..d3c24a7a3936 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -1233,7 +1233,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(pm860x_pm_ops, pm860x_suspend, pm860x_resume);
static const struct i2c_device_id pm860x_id_table[] = {
{ .name = "88PM860x" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(i2c, pm860x_id_table);
diff --git a/drivers/mfd/act8945a.c b/drivers/mfd/act8945a.c
index bb1b4e4fb288..e5fba40f89d4 100644
--- a/drivers/mfd/act8945a.c
+++ b/drivers/mfd/act8945a.c
@@ -55,7 +55,7 @@ static int act8945a_i2c_probe(struct i2c_client *i2c)
static const struct i2c_device_id act8945a_i2c_id[] = {
{ .name = "act8945a" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(i2c, act8945a_i2c_id);
diff --git a/drivers/mfd/as3711.c b/drivers/mfd/as3711.c
index eb03b813d58f..6d2fa63e7f4b 100644
--- a/drivers/mfd/as3711.c
+++ b/drivers/mfd/as3711.c
@@ -193,7 +193,7 @@ static int as3711_i2c_probe(struct i2c_client *client)
static const struct i2c_device_id as3711_i2c_id[] = {
{ .name = "as3711" },
- {}
+ { }
};
static struct i2c_driver as3711_i2c_driver = {
diff --git a/drivers/mfd/as3722.c b/drivers/mfd/as3722.c
index 2f58709ffd9a..ec7be5fb326e 100644
--- a/drivers/mfd/as3722.c
+++ b/drivers/mfd/as3722.c
@@ -433,7 +433,7 @@ MODULE_DEVICE_TABLE(of, as3722_of_match);
static const struct i2c_device_id as3722_i2c_id[] = {
{ .name = "as3722" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(i2c, as3722_i2c_id);
diff --git a/drivers/mfd/bq257xx.c b/drivers/mfd/bq257xx.c
index 5310337fe9d4..48c5b132de2f 100644
--- a/drivers/mfd/bq257xx.c
+++ b/drivers/mfd/bq257xx.c
@@ -131,7 +131,7 @@ static int bq257xx_probe(struct i2c_client *client)
static const struct i2c_device_id bq257xx_i2c_ids[] = {
{ .name = "bq25703a", .driver_data = BQ25703A },
{ .name = "bq25792", .driver_data = BQ25792 },
- {}
+ { }
};
MODULE_DEVICE_TABLE(i2c, bq257xx_i2c_ids);
diff --git a/drivers/mfd/cs40l50-i2c.c b/drivers/mfd/cs40l50-i2c.c
index 6043eb6639b5..b61b0484644d 100644
--- a/drivers/mfd/cs40l50-i2c.c
+++ b/drivers/mfd/cs40l50-i2c.c
@@ -41,7 +41,7 @@ static void cs40l50_i2c_remove(struct i2c_client *i2c)
static const struct i2c_device_id cs40l50_id_i2c[] = {
{ .name = "cs40l50" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(i2c, cs40l50_id_i2c);
diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c
index 64c7ea0b5d2b..4491aba8f835 100644
--- a/drivers/mfd/da903x.c
+++ b/drivers/mfd/da903x.c
@@ -449,7 +449,7 @@ static const struct da903x_chip_ops da903x_ops[] = {
static const struct i2c_device_id da903x_id_table[] = {
{ .name = "da9030", .driver_data = 0 },
{ .name = "da9034", .driver_data = 1 },
- { },
+ { }
};
MODULE_DEVICE_TABLE(i2c, da903x_id_table);
diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c
index b75cfe805d5e..6af9552ccba1 100644
--- a/drivers/mfd/da9052-i2c.c
+++ b/drivers/mfd/da9052-i2c.c
@@ -108,7 +108,7 @@ static const struct i2c_device_id da9052_i2c_id[] = {
{ .name = "da9053-ba", .driver_data = DA9053_BA },
{ .name = "da9053-bb", .driver_data = DA9053_BB },
{ .name = "da9053-bc", .driver_data = DA9053_BC },
- {}
+ { }
};
MODULE_DEVICE_TABLE(i2c, da9052_i2c_id);
diff --git a/drivers/mfd/da9063-i2c.c b/drivers/mfd/da9063-i2c.c
index b57a6ee90aa9..068f080d1f9b 100644
--- a/drivers/mfd/da9063-i2c.c
+++ b/drivers/mfd/da9063-i2c.c
@@ -478,7 +478,7 @@ static int da9063_i2c_probe(struct i2c_client *i2c)
static const struct i2c_device_id da9063_i2c_id[] = {
{ .name = "da9063", .driver_data = PMIC_TYPE_DA9063 },
{ .name = "da9063l", .driver_data = PMIC_TYPE_DA9063L },
- {},
+ { }
};
MODULE_DEVICE_TABLE(i2c, da9063_i2c_id);
diff --git a/drivers/mfd/max77620.c b/drivers/mfd/max77620.c
index a66ca73997f5..e4d7cb4afef0 100644
--- a/drivers/mfd/max77620.c
+++ b/drivers/mfd/max77620.c
@@ -697,7 +697,7 @@ static const struct i2c_device_id max77620_id[] = {
{ .name = "max77620", .driver_data = MAX77620 },
{ .name = "max20024", .driver_data = MAX20024 },
{ .name = "max77663", .driver_data = MAX77663 },
- {},
+ { }
};
static DEFINE_SIMPLE_DEV_PM_OPS(max77620_pm_ops,
diff --git a/drivers/mfd/max77843.c b/drivers/mfd/max77843.c
index d3224cf5e3f6..238584e703b8 100644
--- a/drivers/mfd/max77843.c
+++ b/drivers/mfd/max77843.c
@@ -170,7 +170,7 @@ static const struct of_device_id max77843_dt_match[] = {
static const struct i2c_device_id max77843_id[] = {
{ .name = "max77843", .driver_data = TYPE_MAX77843 },
- { },
+ { }
};
static int max77843_suspend(struct device *dev)
diff --git a/drivers/mfd/max8907.c b/drivers/mfd/max8907.c
index 70ffc08a96d1..6e2fed7021a8 100644
--- a/drivers/mfd/max8907.c
+++ b/drivers/mfd/max8907.c
@@ -301,7 +301,7 @@ MODULE_DEVICE_TABLE(of, max8907_of_match);
static const struct i2c_device_id max8907_i2c_id[] = {
{ .name = "max8907" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(i2c, max8907_i2c_id);
diff --git a/drivers/mfd/rc5t583.c b/drivers/mfd/rc5t583.c
index 4ad761fbfab2..acb42868be37 100644
--- a/drivers/mfd/rc5t583.c
+++ b/drivers/mfd/rc5t583.c
@@ -281,7 +281,7 @@ static int rc5t583_i2c_probe(struct i2c_client *i2c)
static const struct i2c_device_id rc5t583_i2c_id[] = {
{ .name = "rc5t583" },
- {}
+ { }
};
static struct i2c_driver rc5t583_i2c_driver = {
diff --git a/drivers/mfd/rsmu_i2c.c b/drivers/mfd/rsmu_i2c.c
index d05aaf576a86..c03db3ce5f12 100644
--- a/drivers/mfd/rsmu_i2c.c
+++ b/drivers/mfd/rsmu_i2c.c
@@ -335,7 +335,7 @@ static const struct i2c_device_id rsmu_i2c_id[] = {
{ .name = "82p33811", .driver_data = RSMU_SABRE },
{ .name = "8v19n850", .driver_data = RSMU_SL },
{ .name = "8v19n851", .driver_data = RSMU_SL },
- {}
+ { }
};
MODULE_DEVICE_TABLE(i2c, rsmu_i2c_id);
diff --git a/drivers/mfd/si476x-i2c.c b/drivers/mfd/si476x-i2c.c
index 549f64255eef..aa2619e41484 100644
--- a/drivers/mfd/si476x-i2c.c
+++ b/drivers/mfd/si476x-i2c.c
@@ -841,7 +841,7 @@ static const struct i2c_device_id si476x_id[] = {
{ .name = "si4761", .driver_data = SI476X_CHIP_SI4761 },
{ .name = "si4764", .driver_data = SI476X_CHIP_SI4764 },
{ .name = "si4768", .driver_data = SI476X_CHIP_SI4768 },
- { },
+ { }
};
MODULE_DEVICE_TABLE(i2c, si476x_id);
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index b0dbee3e6ea2..d19bd3643591 100644
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -532,9 +532,9 @@ static int tps65910_i2c_probe(struct i2c_client *i2c)
}
static const struct i2c_device_id tps65910_i2c_id[] = {
- { .name = "tps65910", .driver_data = TPS65910 },
- { .name = "tps65911", .driver_data = TPS65911 },
- { }
+ { .name = "tps65910", .driver_data = TPS65910 },
+ { .name = "tps65911", .driver_data = TPS65911 },
+ { }
};
static struct i2c_driver tps65910_i2c_driver = {
diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c
index 1c0ba450ef9b..d3180aa44e1a 100644
--- a/drivers/mfd/wm8400-core.c
+++ b/drivers/mfd/wm8400-core.c
@@ -135,8 +135,8 @@ static int wm8400_i2c_probe(struct i2c_client *i2c)
}
static const struct i2c_device_id wm8400_i2c_id[] = {
- { .name = "wm8400" },
- { }
+ { .name = "wm8400" },
+ { }
};
static struct i2c_driver wm8400_i2c_driver = {
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* [PATCH v4 19/20] mfd: Unify style of of_device_id arrays
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (17 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 18/20] mfd: Unify style of i2c_device_id arrays Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
2026-11-11 2:15 ` Chen-Yu Tsai
` (2 more replies)
2026-11-10 21:54 ` [PATCH v4 20/20] mfd: Unify style of pci_device_id arrays Uwe Kleine-König (The Capable Hub)
19 siblings, 3 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones
Cc: Linus Walleij, Nicolas Ferre, Alexandre Belloni, Claudiu Beznea,
Chen-Yu Tsai, Florian Fainelli,
Broadcom internal kernel review list, Ray Jui, Scott Branden,
Marek Vasut, James Ogletree, Fred Treven, Ben Bright,
David Rhodes, Richard Fitzgerald, Support Opensource,
Krzysztof Kozlowski, Peter Griffin, Alim Akhtar, Tim Harvey,
Neil Armstrong, Charles Keepax, Sven Peter, Janne Grunau,
Neal Gompa, Chanwoo Choi, Mathieu Dubois-Briand, Luca Ceresoli,
André Draszik, Saravanan Sekar, Matthias Brugger,
AngeloGioacchino Del Regno, Frank Li, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, Jonathan Neuschäfer,
Aaro Koskinen, Andreas Kemnade, Kevin Hilman, Roger Quadros,
Tony Lindgren, Matti Vaittinen, Orson Zhai, Baolin Wang,
Chunyan Zhang, Fabrice Gasnier, Maxime Coquelin,
Alexandre Torgue, Jernej Skrabec, Samuel Holland, Liviu Dudau,
Sudeep Holla, Lorenzo Pieralisi, Geert Uytterhoeven, Magnus Damm,
Heiko Stuebner, mfd, linux-kernel, linux-arm-kernel, patches,
linux-rpi-kernel, linux-renesas-soc, linux-sound,
linux-samsung-soc, linux-amlogic, asahi, linux-mediatek, imx,
linux-omap, linux-arm-msm, linux-stm32, linux-sunxi,
linux-rockchip
These arrays already mostly match the most used and generally
recommended coding style. That is:
- no comma after the list terminator;
- a comma after an initializer if (and only if) the closing } is not
directly following;
- no explicit zeros in the list terminator;
- a space after an opening { and before a closing }, a single space in
the list terminator;
Adapt the offenders accordingly.
Reviewed-by: André Draszik <andre.draszik@linaro.org> # for Maxim MAX77759
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> # renesas
Reviewed-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> # max7360
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/88pm860x-core.c | 4 ++--
drivers/mfd/ab8500-sysctrl.c | 4 ++--
drivers/mfd/ac100.c | 2 +-
drivers/mfd/act8945a.c | 4 ++--
drivers/mfd/altera-a10sr.c | 2 +-
drivers/mfd/altera-sysmgr.c | 2 +-
drivers/mfd/arizona-i2c.c | 2 +-
drivers/mfd/arizona-spi.c | 2 +-
drivers/mfd/as3711.c | 4 ++--
drivers/mfd/as3722.c | 4 ++--
drivers/mfd/atmel-hlcdc.c | 2 +-
drivers/mfd/atmel-smc.c | 2 +-
drivers/mfd/axp20x-i2c.c | 2 +-
drivers/mfd/axp20x-rsb.c | 2 +-
drivers/mfd/bcm2835-pm.c | 4 ++--
drivers/mfd/bd9571mwv.c | 4 ++--
drivers/mfd/bq257xx.c | 2 +-
drivers/mfd/cs40l50-i2c.c | 2 +-
drivers/mfd/cs40l50-spi.c | 2 +-
drivers/mfd/cs42l43-i2c.c | 2 +-
drivers/mfd/da9055-i2c.c | 2 +-
drivers/mfd/da9063-i2c.c | 5 +++--
drivers/mfd/da9150-core.c | 2 +-
drivers/mfd/db8500-prcmu.c | 4 ++--
drivers/mfd/exynos-lpass.c | 2 +-
drivers/mfd/gateworks-gsc.c | 2 +-
drivers/mfd/hi6421-pmic-core.c | 6 +++---
drivers/mfd/hi655x-pmic.c | 4 ++--
drivers/mfd/khadas-mcu.c | 2 +-
drivers/mfd/lochnagar-i2c.c | 2 +-
drivers/mfd/lp3943.c | 2 +-
drivers/mfd/lp873x.c | 6 +++---
drivers/mfd/lp87565.c | 2 +-
drivers/mfd/macsmc.c | 2 +-
drivers/mfd/madera-core.c | 2 +-
drivers/mfd/max14577.c | 2 +-
drivers/mfd/max7360.c | 2 +-
drivers/mfd/max77686.c | 2 +-
drivers/mfd/max77693.c | 2 +-
drivers/mfd/max77714.c | 2 +-
drivers/mfd/max77759.c | 2 +-
drivers/mfd/max77843.c | 4 ++--
drivers/mfd/max8907.c | 2 +-
drivers/mfd/max8925-i2c.c | 4 ++--
drivers/mfd/max8997.c | 2 +-
drivers/mfd/max8998.c | 2 +-
drivers/mfd/mc13xxx-spi.c | 6 +++---
drivers/mfd/mp2629.c | 2 +-
drivers/mfd/mt6360-core.c | 4 ++--
drivers/mfd/mt6370.c | 2 +-
drivers/mfd/mxs-lradc.c | 4 ++--
drivers/mfd/ntxec.c | 4 ++--
drivers/mfd/omap-usb-host.c | 4 ++--
drivers/mfd/qcom-pm8008.c | 4 ++--
drivers/mfd/qcom-pm8xxx.c | 6 +++---
drivers/mfd/rave-sp.c | 4 ++--
drivers/mfd/rk8xx-i2c.c | 2 +-
drivers/mfd/rk8xx-spi.c | 2 +-
drivers/mfd/rohm-bd71828.c | 4 ++--
drivers/mfd/rohm-bd9576.c | 6 +++---
drivers/mfd/rsmu_i2c.c | 2 +-
drivers/mfd/rsmu_spi.c | 2 +-
drivers/mfd/rt4831.c | 4 ++--
drivers/mfd/rt5033.c | 2 +-
drivers/mfd/rt5120.c | 2 +-
drivers/mfd/rz-mtu3.c | 2 +-
drivers/mfd/sec-acpm.c | 6 +++---
drivers/mfd/sec-i2c.c | 22 +++++++++++-----------
drivers/mfd/simple-mfd-i2c.c | 2 +-
drivers/mfd/sky81452.c | 2 +-
drivers/mfd/sm501.c | 2 +-
drivers/mfd/smpro-core.c | 2 +-
drivers/mfd/sprd-sc27xx-spi.c | 2 +-
drivers/mfd/ssbi.c | 2 +-
drivers/mfd/stm32-lptimer.c | 4 ++--
drivers/mfd/stm32-timers.c | 4 ++--
drivers/mfd/stmfx.c | 4 ++--
drivers/mfd/stmpe-i2c.c | 18 +++++++++---------
drivers/mfd/stmpe-spi.c | 14 +++++++-------
drivers/mfd/stpmic1.c | 4 ++--
drivers/mfd/stw481x.c | 6 +++---
drivers/mfd/sun6i-prcm.c | 2 +-
drivers/mfd/tps6105x.c | 2 +-
drivers/mfd/tps6507x.c | 4 ++--
drivers/mfd/tps65086.c | 2 +-
drivers/mfd/tps65090.c | 4 ++--
drivers/mfd/tps65217.c | 4 ++--
drivers/mfd/tps65218.c | 4 ++--
drivers/mfd/tps65219.c | 8 ++++----
drivers/mfd/tps6586x.c | 4 ++--
drivers/mfd/tps65910.c | 6 +++---
drivers/mfd/tps65912-i2c.c | 2 +-
drivers/mfd/tps65912-spi.c | 2 +-
drivers/mfd/tps6594-i2c.c | 12 ++++++------
drivers/mfd/tps6594-spi.c | 12 ++++++------
drivers/mfd/twl4030-audio.c | 4 ++--
drivers/mfd/twl4030-power.c | 2 +-
drivers/mfd/twl6030-irq.c | 2 +-
drivers/mfd/vexpress-sysreg.c | 4 ++--
drivers/mfd/wm831x-core.c | 2 +-
100 files changed, 185 insertions(+), 184 deletions(-)
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index d3c24a7a3936..2bde245fc89e 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -1238,8 +1238,8 @@ static const struct i2c_device_id pm860x_id_table[] = {
MODULE_DEVICE_TABLE(i2c, pm860x_id_table);
static const struct of_device_id pm860x_dt_ids[] = {
- { .compatible = "marvell,88pm860x", },
- {},
+ { .compatible = "marvell,88pm860x" },
+ { }
};
MODULE_DEVICE_TABLE(of, pm860x_dt_ids);
diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c
index b6b44e2e3198..e4a7d864e254 100644
--- a/drivers/mfd/ab8500-sysctrl.c
+++ b/drivers/mfd/ab8500-sysctrl.c
@@ -149,8 +149,8 @@ static void ab8500_sysctrl_remove(struct platform_device *pdev)
}
static const struct of_device_id ab8500_sysctrl_match[] = {
- { .compatible = "stericsson,ab8500-sysctrl", },
- {}
+ { .compatible = "stericsson,ab8500-sysctrl" },
+ { }
};
static struct platform_driver ab8500_sysctrl_driver = {
diff --git a/drivers/mfd/ac100.c b/drivers/mfd/ac100.c
index 8f47c392cbd1..a22e3ce7d484 100644
--- a/drivers/mfd/ac100.c
+++ b/drivers/mfd/ac100.c
@@ -116,7 +116,7 @@ static int ac100_rsb_probe(struct sunxi_rsb_device *rdev)
static const struct of_device_id ac100_of_match[] = {
{ .compatible = "x-powers,ac100" },
- { },
+ { }
};
MODULE_DEVICE_TABLE(of, ac100_of_match);
diff --git a/drivers/mfd/act8945a.c b/drivers/mfd/act8945a.c
index e5fba40f89d4..31b46d032363 100644
--- a/drivers/mfd/act8945a.c
+++ b/drivers/mfd/act8945a.c
@@ -60,8 +60,8 @@ static const struct i2c_device_id act8945a_i2c_id[] = {
MODULE_DEVICE_TABLE(i2c, act8945a_i2c_id);
static const struct of_device_id act8945a_of_match[] = {
- { .compatible = "active-semi,act8945a", },
- {},
+ { .compatible = "active-semi,act8945a" },
+ { }
};
MODULE_DEVICE_TABLE(of, act8945a_of_match);
diff --git a/drivers/mfd/altera-a10sr.c b/drivers/mfd/altera-a10sr.c
index 9c0262228655..6ce20c764e30 100644
--- a/drivers/mfd/altera-a10sr.c
+++ b/drivers/mfd/altera-a10sr.c
@@ -149,7 +149,7 @@ static int altr_a10sr_spi_probe(struct spi_device *spi)
static const struct of_device_id altr_a10sr_spi_of_match[] = {
{ .compatible = "altr,a10sr" },
- { },
+ { }
};
MODULE_DEVICE_TABLE(of, altr_a10sr_spi_of_match);
diff --git a/drivers/mfd/altera-sysmgr.c b/drivers/mfd/altera-sysmgr.c
index 90c6902d537d..a9b9164b3651 100644
--- a/drivers/mfd/altera-sysmgr.c
+++ b/drivers/mfd/altera-sysmgr.c
@@ -175,7 +175,7 @@ static int sysmgr_probe(struct platform_device *pdev)
static const struct of_device_id altr_sysmgr_of_match[] = {
{ .compatible = "altr,sys-mgr" },
{ .compatible = "altr,sys-mgr-s10" },
- {},
+ { }
};
MODULE_DEVICE_TABLE(of, altr_sysmgr_of_match);
diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c
index 1ea8a59948b6..763d9c1bd0ed 100644
--- a/drivers/mfd/arizona-i2c.c
+++ b/drivers/mfd/arizona-i2c.c
@@ -103,7 +103,7 @@ static const struct of_device_id arizona_i2c_of_match[] = {
{ .compatible = "wlf,wm8997", .data = (void *)WM8997 },
{ .compatible = "wlf,wm8998", .data = (void *)WM8998 },
{ .compatible = "wlf,wm1814", .data = (void *)WM1814 },
- {},
+ { }
};
MODULE_DEVICE_TABLE(of, arizona_i2c_of_match);
#endif
diff --git a/drivers/mfd/arizona-spi.c b/drivers/mfd/arizona-spi.c
index 04baf5a1c652..c02b291574a6 100644
--- a/drivers/mfd/arizona-spi.c
+++ b/drivers/mfd/arizona-spi.c
@@ -271,7 +271,7 @@ static const struct of_device_id arizona_spi_of_match[] = {
{ .compatible = "wlf,wm8280", .data = (void *)WM8280 },
{ .compatible = "wlf,wm1831", .data = (void *)WM1831 },
{ .compatible = "cirrus,cs47l24", .data = (void *)CS47L24 },
- {},
+ { }
};
MODULE_DEVICE_TABLE(of, arizona_spi_of_match);
#endif
diff --git a/drivers/mfd/as3711.c b/drivers/mfd/as3711.c
index 6d2fa63e7f4b..6301b09585ba 100644
--- a/drivers/mfd/as3711.c
+++ b/drivers/mfd/as3711.c
@@ -111,8 +111,8 @@ static const struct regmap_config as3711_regmap_config = {
#ifdef CONFIG_OF
static const struct of_device_id as3711_of_match[] = {
- {.compatible = "ams,as3711",},
- {}
+ { .compatible = "ams,as3711" },
+ { }
};
#endif
diff --git a/drivers/mfd/as3722.c b/drivers/mfd/as3722.c
index ec7be5fb326e..bf2564836553 100644
--- a/drivers/mfd/as3722.c
+++ b/drivers/mfd/as3722.c
@@ -426,8 +426,8 @@ static int __maybe_unused as3722_i2c_resume(struct device *dev)
}
static const struct of_device_id as3722_of_match[] = {
- { .compatible = "ams,as3722", },
- {},
+ { .compatible = "ams,as3722" },
+ { }
};
MODULE_DEVICE_TABLE(of, as3722_of_match);
diff --git a/drivers/mfd/atmel-hlcdc.c b/drivers/mfd/atmel-hlcdc.c
index 2a3a05122176..64f64736d819 100644
--- a/drivers/mfd/atmel-hlcdc.c
+++ b/drivers/mfd/atmel-hlcdc.c
@@ -149,7 +149,7 @@ static const struct of_device_id atmel_hlcdc_match[] = {
{ .compatible = "microchip,sam9x60-hlcdc" },
{ .compatible = "microchip,sam9x75-xlcdc" },
{ .compatible = "microchip,sama7d65-xlcdc" },
- { /* sentinel */ },
+ { /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, atmel_hlcdc_match);
diff --git a/drivers/mfd/atmel-smc.c b/drivers/mfd/atmel-smc.c
index e69be61511a4..94d03a5e2207 100644
--- a/drivers/mfd/atmel-smc.c
+++ b/drivers/mfd/atmel-smc.c
@@ -333,7 +333,7 @@ static const struct of_device_id atmel_smc_ids[] __maybe_unused = {
{ .compatible = "atmel,at91sam9260-smc", .data = NULL },
{ .compatible = "atmel,sama5d3-smc", .data = &sama5d3_reg_layout },
{ .compatible = "atmel,sama5d2-smc", .data = &sama5d2_reg_layout },
- { /* sentinel */ },
+ { /* sentinel */ }
};
/**
diff --git a/drivers/mfd/axp20x-i2c.c b/drivers/mfd/axp20x-i2c.c
index 57695e46e00e..9754181bf53b 100644
--- a/drivers/mfd/axp20x-i2c.c
+++ b/drivers/mfd/axp20x-i2c.c
@@ -70,7 +70,7 @@ static const struct of_device_id axp20x_i2c_of_match[] = {
{ .compatible = "x-powers,axp803", .data = (void *)AXP803_ID },
{ .compatible = "x-powers,axp806", .data = (void *)AXP806_ID },
{ .compatible = "x-powers,axp15060", .data = (void *)AXP15060_ID },
- { },
+ { }
};
MODULE_DEVICE_TABLE(of, axp20x_i2c_of_match);
#endif
diff --git a/drivers/mfd/axp20x-rsb.c b/drivers/mfd/axp20x-rsb.c
index 059656f2a1bd..7fe71520d5dc 100644
--- a/drivers/mfd/axp20x-rsb.c
+++ b/drivers/mfd/axp20x-rsb.c
@@ -63,7 +63,7 @@ static const struct of_device_id axp20x_rsb_of_match[] = {
{ .compatible = "x-powers,axp806", .data = (void *)AXP806_ID },
{ .compatible = "x-powers,axp809", .data = (void *)AXP809_ID },
{ .compatible = "x-powers,axp813", .data = (void *)AXP813_ID },
- { },
+ { }
};
MODULE_DEVICE_TABLE(of, axp20x_rsb_of_match);
diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c
index 87de35075419..d812a62a05f7 100644
--- a/drivers/mfd/bcm2835-pm.c
+++ b/drivers/mfd/bcm2835-pm.c
@@ -113,11 +113,11 @@ static int bcm2835_pm_probe(struct platform_device *pdev)
}
static const struct of_device_id bcm2835_pm_of_match[] = {
- { .compatible = "brcm,bcm2835-pm-wdt", },
+ { .compatible = "brcm,bcm2835-pm-wdt" },
{ .compatible = "brcm,bcm2835-pm", .data = (void *)BCM2835_PM_SOC_BCM2835 },
{ .compatible = "brcm,bcm2711-pm", .data = (void *)BCM2835_PM_SOC_BCM2711 },
{ .compatible = "brcm,bcm2712-pm", .data = (void *)BCM2835_PM_SOC_BCM2712 },
- {},
+ { }
};
MODULE_DEVICE_TABLE(of, bcm2835_pm_of_match);
diff --git a/drivers/mfd/bd9571mwv.c b/drivers/mfd/bd9571mwv.c
index 2b6fe6fd9806..76ccca5ffbf8 100644
--- a/drivers/mfd/bd9571mwv.c
+++ b/drivers/mfd/bd9571mwv.c
@@ -261,8 +261,8 @@ static int bd9571mwv_probe(struct i2c_client *client)
}
static const struct of_device_id bd9571mwv_of_match_table[] = {
- { .compatible = "rohm,bd9571mwv", },
- { .compatible = "rohm,bd9574mwf", },
+ { .compatible = "rohm,bd9571mwv" },
+ { .compatible = "rohm,bd9574mwf" },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, bd9571mwv_of_match_table);
diff --git a/drivers/mfd/bq257xx.c b/drivers/mfd/bq257xx.c
index 48c5b132de2f..8fd3c859550f 100644
--- a/drivers/mfd/bq257xx.c
+++ b/drivers/mfd/bq257xx.c
@@ -138,7 +138,7 @@ MODULE_DEVICE_TABLE(i2c, bq257xx_i2c_ids);
static const struct of_device_id bq257xx_of_match[] = {
{ .compatible = "ti,bq25703a", .data = (void *)BQ25703A },
{ .compatible = "ti,bq25792", .data = (void *)BQ25792 },
- {}
+ { }
};
MODULE_DEVICE_TABLE(of, bq257xx_of_match);
diff --git a/drivers/mfd/cs40l50-i2c.c b/drivers/mfd/cs40l50-i2c.c
index b61b0484644d..7d2455d95275 100644
--- a/drivers/mfd/cs40l50-i2c.c
+++ b/drivers/mfd/cs40l50-i2c.c
@@ -47,7 +47,7 @@ MODULE_DEVICE_TABLE(i2c, cs40l50_id_i2c);
static const struct of_device_id cs40l50_of_match[] = {
{ .compatible = "cirrus,cs40l50" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(of, cs40l50_of_match);
diff --git a/drivers/mfd/cs40l50-spi.c b/drivers/mfd/cs40l50-spi.c
index a635951ca6b7..902a6c324d83 100644
--- a/drivers/mfd/cs40l50-spi.c
+++ b/drivers/mfd/cs40l50-spi.c
@@ -47,7 +47,7 @@ MODULE_DEVICE_TABLE(spi, cs40l50_id_spi);
static const struct of_device_id cs40l50_of_match[] = {
{ .compatible = "cirrus,cs40l50" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(of, cs40l50_of_match);
diff --git a/drivers/mfd/cs42l43-i2c.c b/drivers/mfd/cs42l43-i2c.c
index 89dca295cc57..90644ea508ee 100644
--- a/drivers/mfd/cs42l43-i2c.c
+++ b/drivers/mfd/cs42l43-i2c.c
@@ -66,7 +66,7 @@ static const struct of_device_id cs42l43_of_match[] = {
{ .compatible = "cirrus,cs42l43", .data = (void *)CS42L43_DEVID_VAL },
{ .compatible = "cirrus,cs42l43b", .data = (void *)CS42L43B_DEVID_VAL },
{ .compatible = "cirrus,cs42l44", .data = (void *)CS42L43B_DEVID_VAL },
- {}
+ { }
};
MODULE_DEVICE_TABLE(of, cs42l43_of_match);
#endif
diff --git a/drivers/mfd/da9055-i2c.c b/drivers/mfd/da9055-i2c.c
index e85db66f79a1..4bb83216a880 100644
--- a/drivers/mfd/da9055-i2c.c
+++ b/drivers/mfd/da9055-i2c.c
@@ -60,7 +60,7 @@ static const struct i2c_device_id da9055_i2c_id[] = {
MODULE_DEVICE_TABLE(i2c, da9055_i2c_id);
static const struct of_device_id da9055_of_match[] = {
- { .compatible = "dlg,da9055-pmic", },
+ { .compatible = "dlg,da9055-pmic" },
{ }
};
diff --git a/drivers/mfd/da9063-i2c.c b/drivers/mfd/da9063-i2c.c
index 068f080d1f9b..a24fd751f343 100644
--- a/drivers/mfd/da9063-i2c.c
+++ b/drivers/mfd/da9063-i2c.c
@@ -361,11 +361,12 @@ static struct regmap_config da9063_regmap_config = {
};
static const struct of_device_id da9063_dt_ids[] = {
- { .compatible = "dlg,da9063", },
- { .compatible = "dlg,da9063l", },
+ { .compatible = "dlg,da9063" },
+ { .compatible = "dlg,da9063l" },
{ }
};
MODULE_DEVICE_TABLE(of, da9063_dt_ids);
+
static int da9063_i2c_probe(struct i2c_client *i2c)
{
const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c
index 74ae7638c211..c25499b161cf 100644
--- a/drivers/mfd/da9150-core.c
+++ b/drivers/mfd/da9150-core.c
@@ -504,7 +504,7 @@ static const struct i2c_device_id da9150_i2c_id[] = {
MODULE_DEVICE_TABLE(i2c, da9150_i2c_id);
static const struct of_device_id da9150_of_match[] = {
- { .compatible = "dlg,da9150", },
+ { .compatible = "dlg,da9150" },
{ }
};
MODULE_DEVICE_TABLE(of, da9150_of_match);
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 6672c55f2ebc..b3cff9976e40 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -3073,8 +3073,8 @@ static int db8500_prcmu_probe(struct platform_device *pdev)
return err;
}
static const struct of_device_id db8500_prcmu_match[] = {
- { .compatible = "stericsson,db8500-prcmu"},
- { },
+ { .compatible = "stericsson,db8500-prcmu" },
+ { }
};
static struct platform_driver db8500_prcmu_driver = {
diff --git a/drivers/mfd/exynos-lpass.c b/drivers/mfd/exynos-lpass.c
index 9bb2687c2835..7e3201e4c9b4 100644
--- a/drivers/mfd/exynos-lpass.c
+++ b/drivers/mfd/exynos-lpass.c
@@ -177,7 +177,7 @@ static const struct dev_pm_ops lpass_pm_ops = {
static const struct of_device_id exynos_lpass_of_match[] = {
{ .compatible = "samsung,exynos5433-lpass" },
- { },
+ { }
};
MODULE_DEVICE_TABLE(of, exynos_lpass_of_match);
diff --git a/drivers/mfd/gateworks-gsc.c b/drivers/mfd/gateworks-gsc.c
index a3301502ce6a..6e561403f509 100644
--- a/drivers/mfd/gateworks-gsc.c
+++ b/drivers/mfd/gateworks-gsc.c
@@ -155,7 +155,7 @@ static struct attribute_group attr_group = {
};
static const struct of_device_id gsc_of_match[] = {
- { .compatible = "gw,gsc", },
+ { .compatible = "gw,gsc" },
{ }
};
MODULE_DEVICE_TABLE(of, gsc_of_match);
diff --git a/drivers/mfd/hi6421-pmic-core.c b/drivers/mfd/hi6421-pmic-core.c
index 5af24a438329..b20cc2c956e7 100644
--- a/drivers/mfd/hi6421-pmic-core.c
+++ b/drivers/mfd/hi6421-pmic-core.c
@@ -38,13 +38,13 @@ static const struct regmap_config hi6421_regmap_config = {
static const struct of_device_id of_hi6421_pmic_match[] = {
{
.compatible = "hisilicon,hi6421-pmic",
- .data = (void *)HI6421
+ .data = (void *)HI6421,
},
{
.compatible = "hisilicon,hi6421v530-pmic",
- .data = (void *)HI6421_V530
+ .data = (void *)HI6421_V530,
},
- { },
+ { }
};
MODULE_DEVICE_TABLE(of, of_hi6421_pmic_match);
diff --git a/drivers/mfd/hi655x-pmic.c b/drivers/mfd/hi655x-pmic.c
index 5cb392892c19..c6625d61b3ef 100644
--- a/drivers/mfd/hi655x-pmic.c
+++ b/drivers/mfd/hi655x-pmic.c
@@ -152,8 +152,8 @@ static void hi655x_pmic_remove(struct platform_device *pdev)
}
static const struct of_device_id hi655x_pmic_match[] = {
- { .compatible = "hisilicon,hi655x-pmic", },
- {},
+ { .compatible = "hisilicon,hi655x-pmic" },
+ { }
};
MODULE_DEVICE_TABLE(of, hi655x_pmic_match);
diff --git a/drivers/mfd/khadas-mcu.c b/drivers/mfd/khadas-mcu.c
index 4b37e74e2b04..8fc5f7d55d2d 100644
--- a/drivers/mfd/khadas-mcu.c
+++ b/drivers/mfd/khadas-mcu.c
@@ -194,7 +194,7 @@ static int khadas_mcu_probe(struct i2c_client *client)
static const struct of_device_id khadas_mcu_of_match[] = {
{ .compatible = "khadas,mcu", .data = (void *)KHADAS_MCU_GENERIC },
{ .compatible = "khadas,vim4-mcu", .data = (void *)KHADAS_MCU_VIM4 },
- {},
+ { }
};
MODULE_DEVICE_TABLE(of, khadas_mcu_of_match);
#endif
diff --git a/drivers/mfd/lochnagar-i2c.c b/drivers/mfd/lochnagar-i2c.c
index 9d60a42745fc..24c609ebc2b0 100644
--- a/drivers/mfd/lochnagar-i2c.c
+++ b/drivers/mfd/lochnagar-i2c.c
@@ -200,7 +200,7 @@ static struct lochnagar_config lochnagar_configs[] = {
static const struct of_device_id lochnagar_of_match[] = {
{ .compatible = "cirrus,lochnagar1", .data = &lochnagar_configs[0] },
{ .compatible = "cirrus,lochnagar2", .data = &lochnagar_configs[1] },
- {},
+ { }
};
static int lochnagar_wait_for_boot(struct regmap *regmap, unsigned int *id)
diff --git a/drivers/mfd/lp3943.c b/drivers/mfd/lp3943.c
index c6465bbf41fa..d64bdba32fe8 100644
--- a/drivers/mfd/lp3943.c
+++ b/drivers/mfd/lp3943.c
@@ -133,7 +133,7 @@ MODULE_DEVICE_TABLE(i2c, lp3943_ids);
#ifdef CONFIG_OF
static const struct of_device_id lp3943_of_match[] = {
- { .compatible = "ti,lp3943", },
+ { .compatible = "ti,lp3943" },
{ }
};
MODULE_DEVICE_TABLE(of, lp3943_of_match);
diff --git a/drivers/mfd/lp873x.c b/drivers/mfd/lp873x.c
index 46444696f2f4..a26b6e507ded 100644
--- a/drivers/mfd/lp873x.c
+++ b/drivers/mfd/lp873x.c
@@ -60,9 +60,9 @@ static int lp873x_probe(struct i2c_client *client)
}
static const struct of_device_id of_lp873x_match_table[] = {
- { .compatible = "ti,lp8733", },
- { .compatible = "ti,lp8732", },
- {}
+ { .compatible = "ti,lp8733" },
+ { .compatible = "ti,lp8732" },
+ { }
};
MODULE_DEVICE_TABLE(of, of_lp873x_match_table);
diff --git a/drivers/mfd/lp87565.c b/drivers/mfd/lp87565.c
index 14e80588efac..543d5423da99 100644
--- a/drivers/mfd/lp87565.c
+++ b/drivers/mfd/lp87565.c
@@ -42,7 +42,7 @@ static const struct of_device_id of_lp87565_match_table[] = {
.compatible = "ti,lp87561-q1",
.data = (void *)LP87565_DEVICE_TYPE_LP87561_Q1,
},
- {}
+ { }
};
MODULE_DEVICE_TABLE(of, of_lp87565_match_table);
diff --git a/drivers/mfd/macsmc.c b/drivers/mfd/macsmc.c
index 514cba7dc897..a0b876a83a0d 100644
--- a/drivers/mfd/macsmc.c
+++ b/drivers/mfd/macsmc.c
@@ -487,7 +487,7 @@ static int apple_smc_probe(struct platform_device *pdev)
static const struct of_device_id apple_smc_of_match[] = {
{ .compatible = "apple,t8103-smc" },
{ .compatible = "apple,smc" },
- {},
+ { }
};
MODULE_DEVICE_TABLE(of, apple_smc_of_match);
diff --git a/drivers/mfd/madera-core.c b/drivers/mfd/madera-core.c
index 2f74a8c644a3..2d74b4511a8f 100644
--- a/drivers/mfd/madera-core.c
+++ b/drivers/mfd/madera-core.c
@@ -381,7 +381,7 @@ const struct of_device_id madera_of_match[] = {
{ .compatible = "cirrus,cs47l92", .data = (void *)CS47L92 },
{ .compatible = "cirrus,cs47l93", .data = (void *)CS47L93 },
{ .compatible = "cirrus,wm1840", .data = (void *)WM1840 },
- {}
+ { }
};
MODULE_DEVICE_TABLE(of, madera_of_match);
EXPORT_SYMBOL_GPL(madera_of_match);
diff --git a/drivers/mfd/max14577.c b/drivers/mfd/max14577.c
index f3325d015ec6..65efcbb3458e 100644
--- a/drivers/mfd/max14577.c
+++ b/drivers/mfd/max14577.c
@@ -140,7 +140,7 @@ static const struct of_device_id max14577_dt_match[] = {
.compatible = "maxim,max77836",
.data = (void *)MAXIM_DEVICE_TYPE_MAX77836,
},
- {},
+ { }
};
MODULE_DEVICE_TABLE(of, max14577_dt_match);
diff --git a/drivers/mfd/max7360.c b/drivers/mfd/max7360.c
index 52fffed0c0dd..dc744b40bb38 100644
--- a/drivers/mfd/max7360.c
+++ b/drivers/mfd/max7360.c
@@ -152,7 +152,7 @@ static int max7360_probe(struct i2c_client *client)
static const struct of_device_id max7360_dt_match[] = {
{ .compatible = "maxim,max7360" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(of, max7360_dt_match);
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index 0118a444a68b..e8983236c1e8 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -153,7 +153,7 @@ static const struct of_device_id max77686_pmic_dt_match[] = {
.compatible = "maxim,max77802",
.data = (void *)TYPE_MAX77802,
},
- { },
+ { }
};
MODULE_DEVICE_TABLE(of, max77686_pmic_dt_match);
diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
index 411011afde37..33f66535e658 100644
--- a/drivers/mfd/max77693.c
+++ b/drivers/mfd/max77693.c
@@ -345,7 +345,7 @@ static const struct dev_pm_ops max77693_pm = {
#ifdef CONFIG_OF
static const struct of_device_id max77693_dt_match[] = {
{ .compatible = "maxim,max77693" },
- {},
+ { }
};
MODULE_DEVICE_TABLE(of, max77693_dt_match);
#endif
diff --git a/drivers/mfd/max77714.c b/drivers/mfd/max77714.c
index c618605a3fb2..353f657da879 100644
--- a/drivers/mfd/max77714.c
+++ b/drivers/mfd/max77714.c
@@ -134,7 +134,7 @@ static int max77714_probe(struct i2c_client *client)
static const struct of_device_id max77714_dt_match[] = {
{ .compatible = "maxim,max77714" },
- {},
+ { }
};
MODULE_DEVICE_TABLE(of, max77714_dt_match);
diff --git a/drivers/mfd/max77759.c b/drivers/mfd/max77759.c
index 2347eb0b014b..5833b267419f 100644
--- a/drivers/mfd/max77759.c
+++ b/drivers/mfd/max77759.c
@@ -718,7 +718,7 @@ static const struct i2c_device_id max77759_i2c_id[] = {
MODULE_DEVICE_TABLE(i2c, max77759_i2c_id);
static const struct of_device_id max77759_of_id[] = {
- { .compatible = "maxim,max77759", },
+ { .compatible = "maxim,max77759" },
{ }
};
MODULE_DEVICE_TABLE(of, max77759_of_id);
diff --git a/drivers/mfd/max77843.c b/drivers/mfd/max77843.c
index 238584e703b8..f87da895cf37 100644
--- a/drivers/mfd/max77843.c
+++ b/drivers/mfd/max77843.c
@@ -164,8 +164,8 @@ static int max77843_probe(struct i2c_client *i2c)
}
static const struct of_device_id max77843_dt_match[] = {
- { .compatible = "maxim,max77843", },
- { },
+ { .compatible = "maxim,max77843" },
+ { }
};
static const struct i2c_device_id max77843_id[] = {
diff --git a/drivers/mfd/max8907.c b/drivers/mfd/max8907.c
index 6e2fed7021a8..c0d185f13de6 100644
--- a/drivers/mfd/max8907.c
+++ b/drivers/mfd/max8907.c
@@ -294,7 +294,7 @@ static void max8907_i2c_remove(struct i2c_client *i2c)
#ifdef CONFIG_OF
static const struct of_device_id max8907_of_match[] = {
{ .compatible = "maxim,max8907" },
- { },
+ { }
};
MODULE_DEVICE_TABLE(of, max8907_of_match);
#endif
diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
index 25390d0eabd4..1fc83dfbeb18 100644
--- a/drivers/mfd/max8925-i2c.c
+++ b/drivers/mfd/max8925-i2c.c
@@ -230,8 +230,8 @@ static DEFINE_SIMPLE_DEV_PM_OPS(max8925_pm_ops,
max8925_suspend, max8925_resume);
static const struct of_device_id max8925_dt_ids[] = {
- { .compatible = "maxim,max8925", },
- {},
+ { .compatible = "maxim,max8925" },
+ { }
};
static struct i2c_driver max8925_driver = {
diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index 6edc18e0eebb..04e44174fd8d 100644
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -39,7 +39,7 @@ static const struct mfd_cell max8997_devs[] = {
#ifdef CONFIG_OF
static const struct of_device_id max8997_pmic_dt_match[] = {
{ .compatible = "maxim,max8997-pmic", .data = (void *)TYPE_MAX8997 },
- {},
+ { }
};
#endif
diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index c5d03c74227d..18faafa85475 100644
--- a/drivers/mfd/max8998.c
+++ b/drivers/mfd/max8998.c
@@ -120,7 +120,7 @@ static const struct of_device_id max8998_dt_match[] = {
{ .compatible = "maxim,max8998", .data = (void *)TYPE_MAX8998 },
{ .compatible = "national,lp3974", .data = (void *)TYPE_LP3974 },
{ .compatible = "ti,lp3974", .data = (void *)TYPE_LP3974 },
- {},
+ { }
};
#endif
diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c
index 56d2e57b7d73..009350aac28f 100644
--- a/drivers/mfd/mc13xxx-spi.c
+++ b/drivers/mfd/mc13xxx-spi.c
@@ -35,9 +35,9 @@ static const struct spi_device_id mc13xxx_device_id[] = {
MODULE_DEVICE_TABLE(spi, mc13xxx_device_id);
static const struct of_device_id mc13xxx_dt_ids[] = {
- { .compatible = "fsl,mc13783", .data = &mc13xxx_variant_mc13783, },
- { .compatible = "fsl,mc13892", .data = &mc13xxx_variant_mc13892, },
- { .compatible = "fsl,mc34708", .data = &mc13xxx_variant_mc34708, },
+ { .compatible = "fsl,mc13783", .data = &mc13xxx_variant_mc13783 },
+ { .compatible = "fsl,mc13892", .data = &mc13xxx_variant_mc13892 },
+ { .compatible = "fsl,mc34708", .data = &mc13xxx_variant_mc34708 },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, mc13xxx_dt_ids);
diff --git a/drivers/mfd/mp2629.c b/drivers/mfd/mp2629.c
index 717b704c3c6b..2634588a284a 100644
--- a/drivers/mfd/mp2629.c
+++ b/drivers/mfd/mp2629.c
@@ -60,7 +60,7 @@ static int mp2629_probe(struct i2c_client *client)
}
static const struct of_device_id mp2629_of_match[] = {
- { .compatible = "mps,mp2629"},
+ { .compatible = "mps,mp2629" },
{ }
};
MODULE_DEVICE_TABLE(of, mp2629_of_match);
diff --git a/drivers/mfd/mt6360-core.c b/drivers/mfd/mt6360-core.c
index 8263e3ff8315..5bc60b97e8ca 100644
--- a/drivers/mfd/mt6360-core.c
+++ b/drivers/mfd/mt6360-core.c
@@ -607,8 +607,8 @@ static int mt6360_resume(struct device *dev)
static DEFINE_SIMPLE_DEV_PM_OPS(mt6360_pm_ops, mt6360_suspend, mt6360_resume);
static const struct of_device_id mt6360_of_id[] = {
- { .compatible = "mediatek,mt6360", },
- {},
+ { .compatible = "mediatek,mt6360" },
+ { }
};
MODULE_DEVICE_TABLE(of, mt6360_of_id);
diff --git a/drivers/mfd/mt6370.c b/drivers/mfd/mt6370.c
index c7c2efe3598c..a7e5808b98ab 100644
--- a/drivers/mfd/mt6370.c
+++ b/drivers/mfd/mt6370.c
@@ -294,7 +294,7 @@ static int mt6370_probe(struct i2c_client *i2c)
static const struct of_device_id mt6370_match_table[] = {
{ .compatible = "mediatek,mt6370" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(of, mt6370_match_table);
diff --git a/drivers/mfd/mxs-lradc.c b/drivers/mfd/mxs-lradc.c
index 64afc7631790..e407bf1d74cf 100644
--- a/drivers/mfd/mxs-lradc.c
+++ b/drivers/mfd/mxs-lradc.c
@@ -117,8 +117,8 @@ static struct mfd_cell mx28_cells[] = {
};
static const struct of_device_id mxs_lradc_dt_ids[] = {
- { .compatible = "fsl,imx23-lradc", .data = (void *)IMX23_LRADC, },
- { .compatible = "fsl,imx28-lradc", .data = (void *)IMX28_LRADC, },
+ { .compatible = "fsl,imx23-lradc", .data = (void *)IMX23_LRADC },
+ { .compatible = "fsl,imx28-lradc", .data = (void *)IMX28_LRADC },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, mxs_lradc_dt_ids);
diff --git a/drivers/mfd/ntxec.c b/drivers/mfd/ntxec.c
index 08c68de0f01b..a16ca4265c40 100644
--- a/drivers/mfd/ntxec.c
+++ b/drivers/mfd/ntxec.c
@@ -250,8 +250,8 @@ static void ntxec_remove(struct i2c_client *client)
}
static const struct of_device_id of_ntxec_match_table[] = {
- { .compatible = "netronix,ntxec", },
- {}
+ { .compatible = "netronix,ntxec" },
+ { }
};
MODULE_DEVICE_TABLE(of, of_ntxec_match_table);
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 4d29a6e2ed87..f9aed3fc02ce 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -516,8 +516,8 @@ static int usbhs_omap_get_dt_pdata(struct device *dev,
}
static const struct of_device_id usbhs_child_match_table[] = {
- { .compatible = "ti,ehci-omap", },
- { .compatible = "ti,ohci-omap3", },
+ { .compatible = "ti,ehci-omap" },
+ { .compatible = "ti,ohci-omap3" },
{ }
};
diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c
index 60204cc9a2dc..c1d522ecc938 100644
--- a/drivers/mfd/qcom-pm8008.c
+++ b/drivers/mfd/qcom-pm8008.c
@@ -261,8 +261,8 @@ static int pm8008_probe(struct i2c_client *client)
}
static const struct of_device_id pm8008_match[] = {
- { .compatible = "qcom,pm8008", },
- { },
+ { .compatible = "qcom,pm8008" },
+ { }
};
MODULE_DEVICE_TABLE(of, pm8008_match);
diff --git a/drivers/mfd/qcom-pm8xxx.c b/drivers/mfd/qcom-pm8xxx.c
index 0cf374c015ce..7547aecde4e0 100644
--- a/drivers/mfd/qcom-pm8xxx.c
+++ b/drivers/mfd/qcom-pm8xxx.c
@@ -499,9 +499,9 @@ static const struct pm_irq_data pm8821_data = {
};
static const struct of_device_id pm8xxx_id_table[] = {
- { .compatible = "qcom,pm8058", .data = &pm8xxx_data},
- { .compatible = "qcom,pm8821", .data = &pm8821_data},
- { .compatible = "qcom,pm8921", .data = &pm8xxx_data},
+ { .compatible = "qcom,pm8058", .data = &pm8xxx_data },
+ { .compatible = "qcom,pm8821", .data = &pm8821_data },
+ { .compatible = "qcom,pm8921", .data = &pm8xxx_data },
{ }
};
MODULE_DEVICE_TABLE(of, pm8xxx_id_table);
diff --git a/drivers/mfd/rave-sp.c b/drivers/mfd/rave-sp.c
index 53c57bafea8f..99d1f704fd90 100644
--- a/drivers/mfd/rave-sp.c
+++ b/drivers/mfd/rave-sp.c
@@ -779,8 +779,8 @@ static const struct of_device_id rave_sp_dt_ids[] = {
{ .compatible = "zii,rave-sp-niu", .data = &rave_sp_legacy },
{ .compatible = "zii,rave-sp-mezz", .data = &rave_sp_legacy },
{ .compatible = "zii,rave-sp-esb", .data = &rave_sp_legacy },
- { .compatible = "zii,rave-sp-rdu1", .data = &rave_sp_rdu1 },
- { .compatible = "zii,rave-sp-rdu2", .data = &rave_sp_rdu2 },
+ { .compatible = "zii,rave-sp-rdu1", .data = &rave_sp_rdu1 },
+ { .compatible = "zii,rave-sp-rdu2", .data = &rave_sp_rdu2 },
{ /* sentinel */ }
};
diff --git a/drivers/mfd/rk8xx-i2c.c b/drivers/mfd/rk8xx-i2c.c
index 161b25fbe146..b87ad6d620fb 100644
--- a/drivers/mfd/rk8xx-i2c.c
+++ b/drivers/mfd/rk8xx-i2c.c
@@ -262,7 +262,7 @@ static const struct of_device_id rk8xx_i2c_of_match[] = {
{ .compatible = "rockchip,rk816", .data = &rk816_data },
{ .compatible = "rockchip,rk817", .data = &rk817_data },
{ .compatible = "rockchip,rk818", .data = &rk818_data },
- { },
+ { }
};
MODULE_DEVICE_TABLE(of, rk8xx_i2c_of_match);
diff --git a/drivers/mfd/rk8xx-spi.c b/drivers/mfd/rk8xx-spi.c
index bb85fe60518f..b5bbf8c09148 100644
--- a/drivers/mfd/rk8xx-spi.c
+++ b/drivers/mfd/rk8xx-spi.c
@@ -98,7 +98,7 @@ static int rk8xx_spi_probe(struct spi_device *spi)
}
static const struct of_device_id rk8xx_spi_of_match[] = {
- { .compatible = "rockchip,rk806", },
+ { .compatible = "rockchip,rk806" },
{ }
};
MODULE_DEVICE_TABLE(of, rk8xx_spi_of_match);
diff --git a/drivers/mfd/rohm-bd71828.c b/drivers/mfd/rohm-bd71828.c
index 46faef7058f8..e8f21d3764fd 100644
--- a/drivers/mfd/rohm-bd71828.c
+++ b/drivers/mfd/rohm-bd71828.c
@@ -1194,8 +1194,8 @@ static const struct of_device_id bd71828_of_match[] = {
}, {
.compatible = "rohm,bd73800",
.data = (void *)ROHM_CHIP_TYPE_BD73800,
- },
- { },
+ },
+ { }
};
MODULE_DEVICE_TABLE(of, bd71828_of_match);
diff --git a/drivers/mfd/rohm-bd9576.c b/drivers/mfd/rohm-bd9576.c
index 17323ae39803..eaf30aa3dcca 100644
--- a/drivers/mfd/rohm-bd9576.c
+++ b/drivers/mfd/rohm-bd9576.c
@@ -167,9 +167,9 @@ static int bd957x_i2c_probe(struct i2c_client *i2c)
}
static const struct of_device_id bd957x_of_match[] = {
- { .compatible = "rohm,bd9576", .data = (void *)ROHM_CHIP_TYPE_BD9576, },
- { .compatible = "rohm,bd9573", .data = (void *)ROHM_CHIP_TYPE_BD9573, },
- { },
+ { .compatible = "rohm,bd9576", .data = (void *)ROHM_CHIP_TYPE_BD9576 },
+ { .compatible = "rohm,bd9573", .data = (void *)ROHM_CHIP_TYPE_BD9573 },
+ { }
};
MODULE_DEVICE_TABLE(of, bd957x_of_match);
diff --git a/drivers/mfd/rsmu_i2c.c b/drivers/mfd/rsmu_i2c.c
index c03db3ce5f12..ae6a83e789db 100644
--- a/drivers/mfd/rsmu_i2c.c
+++ b/drivers/mfd/rsmu_i2c.c
@@ -347,7 +347,7 @@ static const struct of_device_id rsmu_i2c_of_match[] = {
{ .compatible = "idt,82p33811", .data = (void *)RSMU_SABRE },
{ .compatible = "idt,8v19n850", .data = (void *)RSMU_SL },
{ .compatible = "idt,8v19n851", .data = (void *)RSMU_SL },
- {}
+ { }
};
MODULE_DEVICE_TABLE(of, rsmu_i2c_of_match);
diff --git a/drivers/mfd/rsmu_spi.c b/drivers/mfd/rsmu_spi.c
index cdb0f9797ec6..84a34edad2a1 100644
--- a/drivers/mfd/rsmu_spi.c
+++ b/drivers/mfd/rsmu_spi.c
@@ -254,7 +254,7 @@ static const struct of_device_id rsmu_spi_of_match[] = {
{ .compatible = "idt,8a34002", .data = (void *)RSMU_CM },
{ .compatible = "idt,82p33810", .data = (void *)RSMU_SABRE },
{ .compatible = "idt,82p33811", .data = (void *)RSMU_SABRE },
- {}
+ { }
};
MODULE_DEVICE_TABLE(of, rsmu_spi_of_match);
diff --git a/drivers/mfd/rt4831.c b/drivers/mfd/rt4831.c
index 2b3f84b81c65..06794ced4124 100644
--- a/drivers/mfd/rt4831.c
+++ b/drivers/mfd/rt4831.c
@@ -99,8 +99,8 @@ static void rt4831_remove(struct i2c_client *client)
}
static const struct of_device_id rt4831_of_match[] = {
- { .compatible = "richtek,rt4831", },
- {}
+ { .compatible = "richtek,rt4831" },
+ { }
};
MODULE_DEVICE_TABLE(of, rt4831_of_match);
diff --git a/drivers/mfd/rt5033.c b/drivers/mfd/rt5033.c
index 799661fb1c72..61edc3b5f86e 100644
--- a/drivers/mfd/rt5033.c
+++ b/drivers/mfd/rt5033.c
@@ -113,7 +113,7 @@ static const struct i2c_device_id rt5033_i2c_id[] = {
MODULE_DEVICE_TABLE(i2c, rt5033_i2c_id);
static const struct of_device_id rt5033_dt_match[] = {
- { .compatible = "richtek,rt5033", },
+ { .compatible = "richtek,rt5033" },
{ }
};
MODULE_DEVICE_TABLE(of, rt5033_dt_match);
diff --git a/drivers/mfd/rt5120.c b/drivers/mfd/rt5120.c
index a229eb292484..b42c0e2e7d15 100644
--- a/drivers/mfd/rt5120.c
+++ b/drivers/mfd/rt5120.c
@@ -104,7 +104,7 @@ static int rt5120_probe(struct i2c_client *i2c)
static const struct of_device_id rt5120_device_match_table[] = {
{ .compatible = "richtek,rt5120" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(of, rt5120_device_match_table);
diff --git a/drivers/mfd/rz-mtu3.c b/drivers/mfd/rz-mtu3.c
index 0a254e61ec0a..75975808dd64 100644
--- a/drivers/mfd/rz-mtu3.c
+++ b/drivers/mfd/rz-mtu3.c
@@ -352,7 +352,7 @@ static int rz_mtu3_probe(struct platform_device *pdev)
}
static const struct of_device_id rz_mtu3_of_match[] = {
- { .compatible = "renesas,rz-mtu3", },
+ { .compatible = "renesas,rz-mtu3" },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, rz_mtu3_of_match);
diff --git a/drivers/mfd/sec-acpm.c b/drivers/mfd/sec-acpm.c
index d11fbf5b94b7..5c744148554e 100644
--- a/drivers/mfd/sec-acpm.c
+++ b/drivers/mfd/sec-acpm.c
@@ -560,9 +560,9 @@ static const struct sec_pmic_acpm_platform_data s2mpg11_data = {
};
static const struct of_device_id sec_pmic_acpm_of_match[] = {
- { .compatible = "samsung,s2mpg10-pmic", .data = &s2mpg10_data, },
- { .compatible = "samsung,s2mpg11-pmic", .data = &s2mpg11_data, },
- { },
+ { .compatible = "samsung,s2mpg10-pmic", .data = &s2mpg10_data },
+ { .compatible = "samsung,s2mpg11-pmic", .data = &s2mpg11_data },
+ { }
};
MODULE_DEVICE_TABLE(of, sec_pmic_acpm_of_match);
diff --git a/drivers/mfd/sec-i2c.c b/drivers/mfd/sec-i2c.c
index 4eec8f7ceee3..5c614098470f 100644
--- a/drivers/mfd/sec-i2c.c
+++ b/drivers/mfd/sec-i2c.c
@@ -236,17 +236,17 @@ static const struct sec_pmic_i2c_platform_data s5m8767_data = {
};
static const struct of_device_id sec_pmic_i2c_of_match[] = {
- { .compatible = "samsung,s2dos05", .data = &s2dos05_data, },
- { .compatible = "samsung,s2mpa01-pmic", .data = &s2mpa01_data, },
- { .compatible = "samsung,s2mps11-pmic", .data = &s2mps11_data, },
- { .compatible = "samsung,s2mps13-pmic", .data = &s2mps13_data, },
- { .compatible = "samsung,s2mps14-pmic", .data = &s2mps14_data, },
- { .compatible = "samsung,s2mps15-pmic", .data = &s2mps15_data, },
- { .compatible = "samsung,s2mpu02-pmic", .data = &s2mpu02_data, },
- { .compatible = "samsung,s2mpu05-pmic", .data = &s2mpu05_data, },
- { .compatible = "samsung,s2mu005-pmic", .data = &s2mu005_data, },
- { .compatible = "samsung,s5m8767-pmic", .data = &s5m8767_data, },
- { },
+ { .compatible = "samsung,s2dos05", .data = &s2dos05_data },
+ { .compatible = "samsung,s2mpa01-pmic", .data = &s2mpa01_data },
+ { .compatible = "samsung,s2mps11-pmic", .data = &s2mps11_data },
+ { .compatible = "samsung,s2mps13-pmic", .data = &s2mps13_data },
+ { .compatible = "samsung,s2mps14-pmic", .data = &s2mps14_data },
+ { .compatible = "samsung,s2mps15-pmic", .data = &s2mps15_data },
+ { .compatible = "samsung,s2mpu02-pmic", .data = &s2mpu02_data },
+ { .compatible = "samsung,s2mpu05-pmic", .data = &s2mpu05_data },
+ { .compatible = "samsung,s2mu005-pmic", .data = &s2mu005_data },
+ { .compatible = "samsung,s5m8767-pmic", .data = &s5m8767_data },
+ { }
};
MODULE_DEVICE_TABLE(of, sec_pmic_i2c_of_match);
diff --git a/drivers/mfd/simple-mfd-i2c.c b/drivers/mfd/simple-mfd-i2c.c
index ef3ce4bdf98b..4813faf9fd3e 100644
--- a/drivers/mfd/simple-mfd-i2c.c
+++ b/drivers/mfd/simple-mfd-i2c.c
@@ -126,7 +126,7 @@ static const struct of_device_id simple_mfd_i2c_of_match[] = {
{ .compatible = "maxim,max77705-battery", .data = &maxim_mon_max77705 },
{ .compatible = "silergy,sy7636a", .data = &silergy_sy7636a },
{ .compatible = "spacemit,p1", .data = &spacemit_p1 },
- {}
+ { }
};
MODULE_DEVICE_TABLE(of, simple_mfd_i2c_of_match);
diff --git a/drivers/mfd/sky81452.c b/drivers/mfd/sky81452.c
index 8a213176b7cd..7d72b357061d 100644
--- a/drivers/mfd/sky81452.c
+++ b/drivers/mfd/sky81452.c
@@ -66,7 +66,7 @@ MODULE_DEVICE_TABLE(i2c, sky81452_ids);
#ifdef CONFIG_OF
static const struct of_device_id sky81452_of_match[] = {
- { .compatible = "skyworks,sky81452", },
+ { .compatible = "skyworks,sky81452" },
{ }
};
MODULE_DEVICE_TABLE(of, sky81452_of_match);
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index 009c200c1d5d..b30488257014 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -1658,7 +1658,7 @@ static struct pci_driver sm501_pci_driver = {
MODULE_ALIAS("platform:sm501");
static const struct of_device_id of_sm501_match_tbl[] = {
- { .compatible = "smi,sm501", },
+ { .compatible = "smi,sm501" },
{ /* end */ }
};
MODULE_DEVICE_TABLE(of, of_sm501_match_tbl);
diff --git a/drivers/mfd/smpro-core.c b/drivers/mfd/smpro-core.c
index 59d31590c69b..b236e4235cb5 100644
--- a/drivers/mfd/smpro-core.c
+++ b/drivers/mfd/smpro-core.c
@@ -120,7 +120,7 @@ static int smpro_core_probe(struct i2c_client *i2c)
static const struct of_device_id smpro_core_of_match[] = {
{ .compatible = "ampere,smpro", .data = &smpro_regmap_config },
- {}
+ { }
};
MODULE_DEVICE_TABLE(of, smpro_core_of_match);
diff --git a/drivers/mfd/sprd-sc27xx-spi.c b/drivers/mfd/sprd-sc27xx-spi.c
index 9a8e6add8fca..c350f37d95ca 100644
--- a/drivers/mfd/sprd-sc27xx-spi.c
+++ b/drivers/mfd/sprd-sc27xx-spi.c
@@ -288,7 +288,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(sprd_pmic_pm_ops,
static const struct of_device_id sprd_pmic_match[] = {
{ .compatible = "sprd,sc2730", .data = (void *)PMIC_TYPE_SC2730 },
{ .compatible = "sprd,sc2731", .data = (void *)PMIC_TYPE_SC2731 },
- {},
+ { }
};
MODULE_DEVICE_TABLE(of, sprd_pmic_match);
diff --git a/drivers/mfd/ssbi.c b/drivers/mfd/ssbi.c
index 6e7aff6e2746..2797aef48a22 100644
--- a/drivers/mfd/ssbi.c
+++ b/drivers/mfd/ssbi.c
@@ -306,7 +306,7 @@ static int ssbi_probe(struct platform_device *pdev)
static const struct of_device_id ssbi_match_table[] = {
{ .compatible = "qcom,ssbi" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(of, ssbi_match_table);
diff --git a/drivers/mfd/stm32-lptimer.c b/drivers/mfd/stm32-lptimer.c
index 123659178cc2..6518d45e9dd3 100644
--- a/drivers/mfd/stm32-lptimer.c
+++ b/drivers/mfd/stm32-lptimer.c
@@ -113,8 +113,8 @@ static int stm32_lptimer_probe(struct platform_device *pdev)
}
static const struct of_device_id stm32_lptimer_of_match[] = {
- { .compatible = "st,stm32-lptimer", },
- {},
+ { .compatible = "st,stm32-lptimer" },
+ { }
};
MODULE_DEVICE_TABLE(of, stm32_lptimer_of_match);
diff --git a/drivers/mfd/stm32-timers.c b/drivers/mfd/stm32-timers.c
index b3dbc02aaf79..0e618260f595 100644
--- a/drivers/mfd/stm32-timers.c
+++ b/drivers/mfd/stm32-timers.c
@@ -348,9 +348,9 @@ static void stm32_timers_remove(struct platform_device *pdev)
}
static const struct of_device_id stm32_timers_of_match[] = {
- { .compatible = "st,stm32-timers", },
+ { .compatible = "st,stm32-timers" },
{ .compatible = "st,stm32mp25-timers", .data = (void *)STM32MP25_TIM_IPIDR },
- { /* end node */ },
+ { /* end node */ }
};
MODULE_DEVICE_TABLE(of, stm32_timers_of_match);
diff --git a/drivers/mfd/stmfx.c b/drivers/mfd/stmfx.c
index f683fdb6ece6..2c7c5f81c2d7 100644
--- a/drivers/mfd/stmfx.c
+++ b/drivers/mfd/stmfx.c
@@ -540,8 +540,8 @@ static int stmfx_resume(struct device *dev)
static DEFINE_SIMPLE_DEV_PM_OPS(stmfx_dev_pm_ops, stmfx_suspend, stmfx_resume);
static const struct of_device_id stmfx_of_match[] = {
- { .compatible = "st,stmfx-0300", },
- {},
+ { .compatible = "st,stmfx-0300" },
+ { }
};
MODULE_DEVICE_TABLE(of, stmfx_of_match);
diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
index 8eee780afa16..8628c6844ba6 100644
--- a/drivers/mfd/stmpe-i2c.c
+++ b/drivers/mfd/stmpe-i2c.c
@@ -54,15 +54,15 @@ static struct stmpe_client_info i2c_ci = {
};
static const struct of_device_id stmpe_of_match[] = {
- { .compatible = "st,stmpe610", .data = (void *)STMPE610, },
- { .compatible = "st,stmpe801", .data = (void *)STMPE801, },
- { .compatible = "st,stmpe811", .data = (void *)STMPE811, },
- { .compatible = "st,stmpe1600", .data = (void *)STMPE1600, },
- { .compatible = "st,stmpe1601", .data = (void *)STMPE1601, },
- { .compatible = "st,stmpe1801", .data = (void *)STMPE1801, },
- { .compatible = "st,stmpe2401", .data = (void *)STMPE2401, },
- { .compatible = "st,stmpe2403", .data = (void *)STMPE2403, },
- {},
+ { .compatible = "st,stmpe610", .data = (void *)STMPE610 },
+ { .compatible = "st,stmpe801", .data = (void *)STMPE801 },
+ { .compatible = "st,stmpe811", .data = (void *)STMPE811 },
+ { .compatible = "st,stmpe1600", .data = (void *)STMPE1600 },
+ { .compatible = "st,stmpe1601", .data = (void *)STMPE1601 },
+ { .compatible = "st,stmpe1801", .data = (void *)STMPE1801 },
+ { .compatible = "st,stmpe2401", .data = (void *)STMPE2401 },
+ { .compatible = "st,stmpe2403", .data = (void *)STMPE2403 },
+ { }
};
MODULE_DEVICE_TABLE(of, stmpe_of_match);
diff --git a/drivers/mfd/stmpe-spi.c b/drivers/mfd/stmpe-spi.c
index 22a3da062dee..7d6dcc9dc5d3 100644
--- a/drivers/mfd/stmpe-spi.c
+++ b/drivers/mfd/stmpe-spi.c
@@ -110,13 +110,13 @@ static void stmpe_spi_remove(struct spi_device *spi)
}
static const struct of_device_id stmpe_spi_of_match[] = {
- { .compatible = "st,stmpe610", },
- { .compatible = "st,stmpe801", },
- { .compatible = "st,stmpe811", },
- { .compatible = "st,stmpe1601", },
- { .compatible = "st,stmpe2401", },
- { .compatible = "st,stmpe2403", },
- { /* sentinel */ },
+ { .compatible = "st,stmpe610" },
+ { .compatible = "st,stmpe801" },
+ { .compatible = "st,stmpe811" },
+ { .compatible = "st,stmpe1601" },
+ { .compatible = "st,stmpe2401" },
+ { .compatible = "st,stmpe2403" },
+ { /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, stmpe_spi_of_match);
diff --git a/drivers/mfd/stpmic1.c b/drivers/mfd/stpmic1.c
index 7c677b0344c6..b8fd99059dc0 100644
--- a/drivers/mfd/stpmic1.c
+++ b/drivers/mfd/stpmic1.c
@@ -223,8 +223,8 @@ static int stpmic1_resume(struct device *dev)
static DEFINE_SIMPLE_DEV_PM_OPS(stpmic1_pm, stpmic1_suspend, stpmic1_resume);
static const struct of_device_id stpmic1_of_match[] = {
- { .compatible = "st,stpmic1", },
- {},
+ { .compatible = "st,stpmic1" },
+ { }
};
MODULE_DEVICE_TABLE(of, stpmic1_of_match);
diff --git a/drivers/mfd/stw481x.c b/drivers/mfd/stw481x.c
index da1e293d36e9..14f60eed9762 100644
--- a/drivers/mfd/stw481x.c
+++ b/drivers/mfd/stw481x.c
@@ -228,9 +228,9 @@ static const struct i2c_device_id stw481x_id[] = {
MODULE_DEVICE_TABLE(i2c, stw481x_id);
static const struct of_device_id stw481x_match[] = {
- { .compatible = "st,stw4810", },
- { .compatible = "st,stw4811", },
- { },
+ { .compatible = "st,stw4810" },
+ { .compatible = "st,stw4811" },
+ { }
};
MODULE_DEVICE_TABLE(of, stw481x_match);
diff --git a/drivers/mfd/sun6i-prcm.c b/drivers/mfd/sun6i-prcm.c
index ee03db0b8485..a8a168f66fc1 100644
--- a/drivers/mfd/sun6i-prcm.c
+++ b/drivers/mfd/sun6i-prcm.c
@@ -122,7 +122,7 @@ static const struct of_device_id sun6i_prcm_dt_ids[] = {
.compatible = "allwinner,sun8i-a23-prcm",
.data = &sun8i_a23_prcm_data,
},
- { /* sentinel */ },
+ { /* sentinel */ }
};
static int sun6i_prcm_probe(struct platform_device *pdev)
diff --git a/drivers/mfd/tps6105x.c b/drivers/mfd/tps6105x.c
index 032ac8ad026a..10874f66ed6b 100644
--- a/drivers/mfd/tps6105x.c
+++ b/drivers/mfd/tps6105x.c
@@ -200,7 +200,7 @@ MODULE_DEVICE_TABLE(i2c, tps6105x_id);
static const struct of_device_id tps6105x_of_match[] = {
{ .compatible = "ti,tps61050" },
{ .compatible = "ti,tps61052" },
- { },
+ { }
};
MODULE_DEVICE_TABLE(of, tps6105x_of_match);
diff --git a/drivers/mfd/tps6507x.c b/drivers/mfd/tps6507x.c
index ed806754d89f..adb1c0d37ac5 100644
--- a/drivers/mfd/tps6507x.c
+++ b/drivers/mfd/tps6507x.c
@@ -110,8 +110,8 @@ MODULE_DEVICE_TABLE(i2c, tps6507x_i2c_id);
#ifdef CONFIG_OF
static const struct of_device_id tps6507x_of_match[] = {
- {.compatible = "ti,tps6507x", },
- {},
+ { .compatible = "ti,tps6507x" },
+ { }
};
MODULE_DEVICE_TABLE(of, tps6507x_of_match);
#endif
diff --git a/drivers/mfd/tps65086.c b/drivers/mfd/tps65086.c
index a73e0b5c0982..51dc0acbe781 100644
--- a/drivers/mfd/tps65086.c
+++ b/drivers/mfd/tps65086.c
@@ -57,7 +57,7 @@ static const struct regmap_irq_chip tps65086_irq_chip = {
};
static const struct of_device_id tps65086_of_match_table[] = {
- { .compatible = "ti,tps65086", },
+ { .compatible = "ti,tps65086" },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, tps65086_of_match_table);
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
index ae845be3a8ea..ffe3a014b8ad 100644
--- a/drivers/mfd/tps65090.c
+++ b/drivers/mfd/tps65090.c
@@ -157,8 +157,8 @@ static const struct regmap_config tps65090_regmap_config = {
#ifdef CONFIG_OF
static const struct of_device_id tps65090_of_match[] = {
- { .compatible = "ti,tps65090",},
- {},
+ { .compatible = "ti,tps65090" },
+ { }
};
#endif
diff --git a/drivers/mfd/tps65217.c b/drivers/mfd/tps65217.c
index e9560a5445b9..eac1396aa7fd 100644
--- a/drivers/mfd/tps65217.c
+++ b/drivers/mfd/tps65217.c
@@ -344,8 +344,8 @@ static const struct regmap_config tps65217_regmap_config = {
};
static const struct of_device_id tps65217_of_match[] = {
- { .compatible = "ti,tps65217"},
- { /* sentinel */ },
+ { .compatible = "ti,tps65217" },
+ { /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, tps65217_of_match);
diff --git a/drivers/mfd/tps65218.c b/drivers/mfd/tps65218.c
index d2d39bd7eddd..37aa43a2e29b 100644
--- a/drivers/mfd/tps65218.c
+++ b/drivers/mfd/tps65218.c
@@ -197,8 +197,8 @@ static const struct regmap_irq_chip tps65218_irq_chip = {
};
static const struct of_device_id of_tps65218_match_table[] = {
- { .compatible = "ti,tps65218", },
- {}
+ { .compatible = "ti,tps65218" },
+ { }
};
MODULE_DEVICE_TABLE(of, of_tps65218_match_table);
diff --git a/drivers/mfd/tps65219.c b/drivers/mfd/tps65219.c
index e52fbf1481fe..a63640221397 100644
--- a/drivers/mfd/tps65219.c
+++ b/drivers/mfd/tps65219.c
@@ -554,10 +554,10 @@ static int tps65219_probe(struct i2c_client *client)
}
static const struct of_device_id of_tps65219_match_table[] = {
- { .compatible = "ti,tps65214", .data = (void *)TPS65214, },
- { .compatible = "ti,tps65215", .data = (void *)TPS65215, },
- { .compatible = "ti,tps65219", .data = (void *)TPS65219, },
- {}
+ { .compatible = "ti,tps65214", .data = (void *)TPS65214 },
+ { .compatible = "ti,tps65215", .data = (void *)TPS65215 },
+ { .compatible = "ti,tps65219", .data = (void *)TPS65219 },
+ { }
};
MODULE_DEVICE_TABLE(of, of_tps65219_match_table);
diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index e58a50d601dd..5df364eb2f31 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -432,8 +432,8 @@ static struct tps6586x_platform_data *tps6586x_parse_dt(struct i2c_client *clien
}
static const struct of_device_id tps6586x_of_match[] = {
- { .compatible = "ti,tps6586x", },
- { },
+ { .compatible = "ti,tps6586x" },
+ { }
};
#else
static struct tps6586x_platform_data *tps6586x_parse_dt(struct i2c_client *client)
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index d19bd3643591..488fd879702e 100644
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -366,9 +366,9 @@ static int tps65910_sleepinit(struct tps65910 *tps65910,
#ifdef CONFIG_OF
static const struct of_device_id tps65910_of_match[] = {
- { .compatible = "ti,tps65910", .data = (void *)TPS65910},
- { .compatible = "ti,tps65911", .data = (void *)TPS65911},
- { },
+ { .compatible = "ti,tps65910", .data = (void *)TPS65910 },
+ { .compatible = "ti,tps65911", .data = (void *)TPS65911 },
+ { }
};
static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,
diff --git a/drivers/mfd/tps65912-i2c.c b/drivers/mfd/tps65912-i2c.c
index 3eca8880532e..66978d1ad537 100644
--- a/drivers/mfd/tps65912-i2c.c
+++ b/drivers/mfd/tps65912-i2c.c
@@ -16,7 +16,7 @@
#include <linux/mfd/tps65912.h>
static const struct of_device_id tps65912_i2c_of_match_table[] = {
- { .compatible = "ti,tps65912", },
+ { .compatible = "ti,tps65912" },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, tps65912_i2c_of_match_table);
diff --git a/drivers/mfd/tps65912-spi.c b/drivers/mfd/tps65912-spi.c
index 2442a2e67d67..6eee103887cd 100644
--- a/drivers/mfd/tps65912-spi.c
+++ b/drivers/mfd/tps65912-spi.c
@@ -16,7 +16,7 @@
#include <linux/mfd/tps65912.h>
static const struct of_device_id tps65912_spi_of_match_table[] = {
- { .compatible = "ti,tps65912", },
+ { .compatible = "ti,tps65912" },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, tps65912_spi_of_match_table);
diff --git a/drivers/mfd/tps6594-i2c.c b/drivers/mfd/tps6594-i2c.c
index d2269f14f068..9935bd6381b4 100644
--- a/drivers/mfd/tps6594-i2c.c
+++ b/drivers/mfd/tps6594-i2c.c
@@ -197,12 +197,12 @@ static struct regmap_config tps6594_i2c_regmap_config = {
};
static const struct of_device_id tps6594_i2c_of_match_table[] = {
- { .compatible = "ti,tps6594-q1", .data = (void *)TPS6594, },
- { .compatible = "ti,tps6593-q1", .data = (void *)TPS6593, },
- { .compatible = "ti,lp8764-q1", .data = (void *)LP8764, },
- { .compatible = "ti,tps65224-q1", .data = (void *)TPS65224, },
- { .compatible = "ti,tps652g1", .data = (void *)TPS652G1, },
- {}
+ { .compatible = "ti,tps6594-q1", .data = (void *)TPS6594 },
+ { .compatible = "ti,tps6593-q1", .data = (void *)TPS6593 },
+ { .compatible = "ti,lp8764-q1", .data = (void *)LP8764 },
+ { .compatible = "ti,tps65224-q1", .data = (void *)TPS65224 },
+ { .compatible = "ti,tps652g1", .data = (void *)TPS652G1 },
+ { }
};
MODULE_DEVICE_TABLE(of, tps6594_i2c_of_match_table);
diff --git a/drivers/mfd/tps6594-spi.c b/drivers/mfd/tps6594-spi.c
index bb95d6b64cb4..5c12b1526378 100644
--- a/drivers/mfd/tps6594-spi.c
+++ b/drivers/mfd/tps6594-spi.c
@@ -82,12 +82,12 @@ static struct regmap_config tps6594_spi_regmap_config = {
};
static const struct of_device_id tps6594_spi_of_match_table[] = {
- { .compatible = "ti,tps6594-q1", .data = (void *)TPS6594, },
- { .compatible = "ti,tps6593-q1", .data = (void *)TPS6593, },
- { .compatible = "ti,lp8764-q1", .data = (void *)LP8764, },
- { .compatible = "ti,tps65224-q1", .data = (void *)TPS65224, },
- { .compatible = "ti,tps652g1", .data = (void *)TPS652G1, },
- {}
+ { .compatible = "ti,tps6594-q1", .data = (void *)TPS6594 },
+ { .compatible = "ti,tps6593-q1", .data = (void *)TPS6593 },
+ { .compatible = "ti,lp8764-q1", .data = (void *)LP8764 },
+ { .compatible = "ti,tps65224-q1", .data = (void *)TPS65224 },
+ { .compatible = "ti,tps652g1", .data = (void *)TPS652G1 },
+ { }
};
MODULE_DEVICE_TABLE(of, tps6594_spi_of_match_table);
diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c
index a4a550bafb3c..96e2a281e7fe 100644
--- a/drivers/mfd/twl4030-audio.c
+++ b/drivers/mfd/twl4030-audio.c
@@ -265,8 +265,8 @@ static void twl4030_audio_remove(struct platform_device *pdev)
}
static const struct of_device_id twl4030_audio_of_match[] = {
- {.compatible = "ti,twl4030-audio", },
- { },
+ { .compatible = "ti,twl4030-audio" },
+ { }
};
MODULE_DEVICE_TABLE(of, twl4030_audio_of_match);
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index fc1cf316c236..f7fe6fcce891 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -875,7 +875,7 @@ static const struct of_device_id twl4030_power_of_match[] = {
.compatible = "ti,twl4030-power-omap3-evm",
.data = &omap3_idle_ac_quirk,
},
- { },
+ { }
};
MODULE_DEVICE_TABLE(of, twl4030_power_of_match);
#endif /* CONFIG_OF */
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index 4303fb288dd5..b3e9fbeb5acb 100644
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -285,7 +285,7 @@ static const struct irq_domain_ops twl6030_irq_domain_ops = {
static const struct of_device_id twl6030_of_match[] __maybe_unused = {
{ .compatible = "ti,twl6030", .data = &twl6030_interrupt_mapping },
{ .compatible = "ti,twl6032", .data = &twl6032_interrupt_mapping },
- { },
+ { }
};
int twl6030_init_irq(struct device *dev, int irq_num)
diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c
index f49cee91f71c..3de377744aa1 100644
--- a/drivers/mfd/vexpress-sysreg.c
+++ b/drivers/mfd/vexpress-sysreg.c
@@ -142,8 +142,8 @@ static int vexpress_sysreg_probe(struct platform_device *pdev)
}
static const struct of_device_id vexpress_sysreg_match[] = {
- { .compatible = "arm,vexpress-sysreg", },
- {},
+ { .compatible = "arm,vexpress-sysreg" },
+ { }
};
MODULE_DEVICE_TABLE(of, vexpress_sysreg_match);
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index df8e76e000cc..00edac4216e2 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -1445,7 +1445,7 @@ const struct of_device_id wm831x_of_match[] = {
{ .compatible = "wlf,wm8321", .data = (void *)WM8321 },
{ .compatible = "wlf,wm8325", .data = (void *)WM8325 },
{ .compatible = "wlf,wm8326", .data = (void *)WM8326 },
- { },
+ { }
};
EXPORT_SYMBOL_GPL(wm831x_of_match);
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH v4 19/20] mfd: Unify style of of_device_id arrays
2026-11-10 21:54 ` [PATCH v4 19/20] mfd: Unify style of of_device_id arrays Uwe Kleine-König (The Capable Hub)
@ 2026-11-11 2:15 ` Chen-Yu Tsai
2026-11-11 5:54 ` Luca Ceresoli
2026-11-11 6:30 ` Matti Vaittinen
2 siblings, 0 replies; 29+ messages in thread
From: Chen-Yu Tsai @ 2026-11-11 2:15 UTC (permalink / raw)
To: Uwe Kleine-König (The Capable Hub)
Cc: Lee Jones, Linus Walleij, Nicolas Ferre, Alexandre Belloni,
Claudiu Beznea, Florian Fainelli,
Broadcom internal kernel review list, Ray Jui, Scott Branden,
Marek Vasut, James Ogletree, Fred Treven, Ben Bright,
David Rhodes, Richard Fitzgerald, Support Opensource,
Krzysztof Kozlowski, Peter Griffin, Alim Akhtar, Tim Harvey,
Neil Armstrong, Charles Keepax, Sven Peter, Janne Grunau,
Neal Gompa, Chanwoo Choi, Mathieu Dubois-Briand, Luca Ceresoli,
André Draszik, Saravanan Sekar, Matthias Brugger,
AngeloGioacchino Del Regno, Frank Li, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, Jonathan Neuschäfer,
Aaro Koskinen, Andreas Kemnade, Kevin Hilman, Roger Quadros,
Tony Lindgren, Matti Vaittinen, Orson Zhai, Baolin Wang,
Chunyan Zhang, Fabrice Gasnier, Maxime Coquelin,
Alexandre Torgue, Jernej Skrabec, Samuel Holland, Liviu Dudau,
Sudeep Holla, Lorenzo Pieralisi, Geert Uytterhoeven, Magnus Damm,
Heiko Stuebner, mfd, linux-kernel, linux-arm-kernel, patches,
linux-rpi-kernel, linux-renesas-soc, linux-sound,
linux-samsung-soc, linux-amlogic, asahi, linux-mediatek, imx,
linux-omap, linux-arm-msm, linux-stm32, linux-sunxi,
linux-rockchip
On Wed, Nov 11, 2026 at 6:56 AM Uwe Kleine-König (The Capable Hub)
<u.kleine-koenig@baylibre.com> wrote:
>
> These arrays already mostly match the most used and generally
> recommended coding style. That is:
>
> - no comma after the list terminator;
> - a comma after an initializer if (and only if) the closing } is not
> directly following;
> - no explicit zeros in the list terminator;
> - a space after an opening { and before a closing }, a single space in
> the list terminator;
>
> Adapt the offenders accordingly.
>
> Reviewed-by: André Draszik <andre.draszik@linaro.org> # for Maxim MAX77759
> Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> # renesas
> Reviewed-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> # max7360
> Reviewed-by: Linus Walleij <linusw@kernel.org>
> Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
> ---
> drivers/mfd/88pm860x-core.c | 4 ++--
> drivers/mfd/ab8500-sysctrl.c | 4 ++--
> drivers/mfd/ac100.c | 2 +-
> drivers/mfd/act8945a.c | 4 ++--
> drivers/mfd/altera-a10sr.c | 2 +-
> drivers/mfd/altera-sysmgr.c | 2 +-
> drivers/mfd/arizona-i2c.c | 2 +-
> drivers/mfd/arizona-spi.c | 2 +-
> drivers/mfd/as3711.c | 4 ++--
> drivers/mfd/as3722.c | 4 ++--
> drivers/mfd/atmel-hlcdc.c | 2 +-
> drivers/mfd/atmel-smc.c | 2 +-
> drivers/mfd/axp20x-i2c.c | 2 +-
> drivers/mfd/axp20x-rsb.c | 2 +-
Acked-by: Chen-Yu Tsai <wens@kernel.org> # axp20x
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH v4 19/20] mfd: Unify style of of_device_id arrays
2026-11-10 21:54 ` [PATCH v4 19/20] mfd: Unify style of of_device_id arrays Uwe Kleine-König (The Capable Hub)
2026-11-11 2:15 ` Chen-Yu Tsai
@ 2026-11-11 5:54 ` Luca Ceresoli
2026-11-11 6:30 ` Matti Vaittinen
2 siblings, 0 replies; 29+ messages in thread
From: Luca Ceresoli @ 2026-11-11 5:54 UTC (permalink / raw)
To: Uwe Kleine-König (The Capable Hub), Lee Jones
Cc: Linus Walleij, Nicolas Ferre, Alexandre Belloni, Claudiu Beznea,
Chen-Yu Tsai, Florian Fainelli,
Broadcom internal kernel review list, Ray Jui, Scott Branden,
Marek Vasut, James Ogletree, Fred Treven, Ben Bright,
David Rhodes, Richard Fitzgerald, Support Opensource,
Krzysztof Kozlowski, Peter Griffin, Alim Akhtar, Tim Harvey,
Neil Armstrong, Charles Keepax, Sven Peter, Janne Grunau,
Neal Gompa, Chanwoo Choi, Mathieu Dubois-Briand, Luca Ceresoli,
André Draszik, Saravanan Sekar, Matthias Brugger,
AngeloGioacchino Del Regno, Frank Li, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, Jonathan Neuschäfer,
Aaro Koskinen, Andreas Kemnade, Kevin Hilman, Roger Quadros,
Tony Lindgren, Matti Vaittinen, Orson Zhai, Baolin Wang,
Chunyan Zhang, Fabrice Gasnier, Maxime Coquelin,
Alexandre Torgue, Jernej Skrabec, Samuel Holland, Liviu Dudau,
Sudeep Holla, Lorenzo Pieralisi, Geert Uytterhoeven, Magnus Damm,
Heiko Stuebner, mfd, linux-kernel, linux-arm-kernel, patches,
linux-rpi-kernel, linux-renesas-soc, linux-sound,
linux-samsung-soc, linux-amlogic, asahi, linux-mediatek, imx,
linux-omap, linux-arm-msm, linux-stm32, linux-sunxi,
linux-rockchip
On Tue Nov 10, 2026 at 10:54 PM CET, Uwe Kleine-König (The Capable Hub) wrote:
> These arrays already mostly match the most used and generally
> recommended coding style. That is:
>
> - no comma after the list terminator;
> - a comma after an initializer if (and only if) the closing } is not
> directly following;
> - no explicit zeros in the list terminator;
> - a space after an opening { and before a closing }, a single space in
> the list terminator;
>
> Adapt the offenders accordingly.
>
> Reviewed-by: André Draszik <andre.draszik@linaro.org> # for Maxim MAX77759
> Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> # renesas
> Reviewed-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> # max7360
> Reviewed-by: Linus Walleij <linusw@kernel.org>
> Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com> # max*
--
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH v4 19/20] mfd: Unify style of of_device_id arrays
2026-11-10 21:54 ` [PATCH v4 19/20] mfd: Unify style of of_device_id arrays Uwe Kleine-König (The Capable Hub)
2026-11-11 2:15 ` Chen-Yu Tsai
2026-11-11 5:54 ` Luca Ceresoli
@ 2026-11-11 6:30 ` Matti Vaittinen
2 siblings, 0 replies; 29+ messages in thread
From: Matti Vaittinen @ 2026-11-11 6:30 UTC (permalink / raw)
To: Uwe Kleine-König (The Capable Hub), Lee Jones
Cc: Linus Walleij, Nicolas Ferre, Alexandre Belloni, Claudiu Beznea,
Chen-Yu Tsai, Florian Fainelli,
Broadcom internal kernel review list, Ray Jui, Scott Branden,
Marek Vasut, James Ogletree, Fred Treven, Ben Bright,
David Rhodes, Richard Fitzgerald, Support Opensource,
Krzysztof Kozlowski, Peter Griffin, Alim Akhtar, Tim Harvey,
Neil Armstrong, Charles Keepax, Sven Peter, Janne Grunau,
Neal Gompa, Chanwoo Choi, Mathieu Dubois-Briand, Luca Ceresoli,
André Draszik, Saravanan Sekar, Matthias Brugger,
AngeloGioacchino Del Regno, Frank Li, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, Jonathan Neuschäfer,
Aaro Koskinen, Andreas Kemnade, Kevin Hilman, Roger Quadros,
Tony Lindgren, Orson Zhai, Baolin Wang, Chunyan Zhang,
Fabrice Gasnier, Maxime Coquelin, Alexandre Torgue,
Jernej Skrabec, Samuel Holland, Liviu Dudau, Sudeep Holla,
Lorenzo Pieralisi, Geert Uytterhoeven, Magnus Damm,
Heiko Stuebner, mfd, linux-kernel, linux-arm-kernel, patches,
linux-rpi-kernel, linux-renesas-soc, linux-sound,
linux-samsung-soc, linux-amlogic, asahi, linux-mediatek, imx,
linux-omap, linux-arm-msm, linux-stm32, linux-sunxi,
linux-rockchip
On 10/11/2026 23:54, Uwe Kleine-König (The Capable Hub) wrote:
> These arrays already mostly match the most used and generally
> recommended coding style. That is:
>
> - no comma after the list terminator;
> - a comma after an initializer if (and only if) the closing } is not
> directly following;
> - no explicit zeros in the list terminator;
> - a space after an opening { and before a closing }, a single space in
> the list terminator;
>
> Adapt the offenders accordingly.
>
> Reviewed-by: André Draszik <andre.draszik@linaro.org> # for Maxim MAX77759
> Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> # renesas
> Reviewed-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> # max7360
> Reviewed-by: Linus Walleij <linusw@kernel.org>
> Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Reviewed-by: Matti Vaittinen <mazziesaccount@gmail.com>
--
Matti Vaittinen
Linux kernel developer at ROHM Semiconductors
Oulu Finland
~~ When things go utterly wrong vim users can always type :help! ~~
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v4 20/20] mfd: Unify style of pci_device_id arrays
2026-11-10 21:54 [PATCH v4 00/20] mfd: Use named initializers for arrays of *_device_data Uwe Kleine-König (The Capable Hub)
` (18 preceding siblings ...)
2026-11-10 21:54 ` [PATCH v4 19/20] mfd: Unify style of of_device_id arrays Uwe Kleine-König (The Capable Hub)
@ 2026-11-10 21:54 ` Uwe Kleine-König (The Capable Hub)
19 siblings, 0 replies; 29+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-11-10 21:54 UTC (permalink / raw)
To: Lee Jones; +Cc: Peter Tyser, mfd, linux-kernel, Linus Walleij
These arrays already mostly match the most used and generally
recommended coding style. That is:
- no comma after the list terminator;
- a comma after an initializer if (and only if) the closing } is not
directly following;
- no explicit zeros in the list terminator;
- a space after an opening { and before a closing }, a single space in
the list terminator;
Adapt the offenders accordingly.
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
drivers/mfd/cs5535-mfd.c | 2 +-
drivers/mfd/intel_quark_i2c_gpio.c | 4 ++--
drivers/mfd/ioc3.c | 2 +-
drivers/mfd/janz-cmodio.c | 2 +-
drivers/mfd/lpc_ich.c | 2 +-
drivers/mfd/rdc321x-southbridge.c | 2 +-
drivers/mfd/sm501.c | 2 +-
drivers/mfd/timberdale.c | 2 +-
drivers/mfd/vx855.c | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/mfd/cs5535-mfd.c b/drivers/mfd/cs5535-mfd.c
index f3becbef19f5..3b52717aa316 100644
--- a/drivers/mfd/cs5535-mfd.c
+++ b/drivers/mfd/cs5535-mfd.c
@@ -155,7 +155,7 @@ static void cs5535_mfd_remove(struct pci_dev *pdev)
static const struct pci_device_id cs5535_mfd_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA) },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },
- { 0, }
+ { }
};
MODULE_DEVICE_TABLE(pci, cs5535_mfd_pci_tbl);
diff --git a/drivers/mfd/intel_quark_i2c_gpio.c b/drivers/mfd/intel_quark_i2c_gpio.c
index 7f8c16d82738..08dda59b9236 100644
--- a/drivers/mfd/intel_quark_i2c_gpio.c
+++ b/drivers/mfd/intel_quark_i2c_gpio.c
@@ -148,8 +148,8 @@ static struct mfd_cell intel_quark_mfd_cells[] = {
};
static const struct pci_device_id intel_quark_mfd_ids[] = {
- { PCI_VDEVICE(INTEL, 0x0934), },
- {},
+ { PCI_VDEVICE(INTEL, 0x0934) },
+ { }
};
MODULE_DEVICE_TABLE(pci, intel_quark_mfd_ids);
diff --git a/drivers/mfd/ioc3.c b/drivers/mfd/ioc3.c
index bf2be3bc8602..b78dbb98b9a5 100644
--- a/drivers/mfd/ioc3.c
+++ b/drivers/mfd/ioc3.c
@@ -655,7 +655,7 @@ static void ioc3_mfd_remove(struct pci_dev *pdev)
static struct pci_device_id ioc3_mfd_id_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3) },
- { 0, },
+ { }
};
MODULE_DEVICE_TABLE(pci, ioc3_mfd_id_table);
diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
index 93e1c04bddd6..96556ea754fa 100644
--- a/drivers/mfd/janz-cmodio.c
+++ b/drivers/mfd/janz-cmodio.c
@@ -265,7 +265,7 @@ static const struct pci_device_id cmodio_pci_ids[] = {
{ PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_JANZ, 0x0202) },
{ PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_JANZ, 0x0201) },
{ PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_JANZ, 0x0202) },
- { 0, }
+ { }
};
MODULE_DEVICE_TABLE(pci, cmodio_pci_ids);
diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
index d2efcc92bb59..8d4b0a499da8 100644
--- a/drivers/mfd/lpc_ich.c
+++ b/drivers/mfd/lpc_ich.c
@@ -958,7 +958,7 @@ static const struct pci_device_id lpc_ich_ids[] = {
{ PCI_VDEVICE(INTEL, 0xa1c7), .driver_data = LPC_LEWISBURG },
{ PCI_VDEVICE(INTEL, 0xa242), .driver_data = LPC_LEWISBURG },
{ PCI_VDEVICE(INTEL, 0xa243), .driver_data = LPC_LEWISBURG },
- { }, /* End of list */
+ { } /* End of list */
};
MODULE_DEVICE_TABLE(pci, lpc_ich_ids);
diff --git a/drivers/mfd/rdc321x-southbridge.c b/drivers/mfd/rdc321x-southbridge.c
index c44a76285147..9405d9ac9918 100644
--- a/drivers/mfd/rdc321x-southbridge.c
+++ b/drivers/mfd/rdc321x-southbridge.c
@@ -79,7 +79,7 @@ static int rdc321x_sb_probe(struct pci_dev *pdev,
static const struct pci_device_id rdc321x_sb_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_RDC, PCI_DEVICE_ID_RDC_R6030) },
- {}
+ { }
};
MODULE_DEVICE_TABLE(pci, rdc321x_sb_table);
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index b30488257014..efe211b675f5 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -1643,7 +1643,7 @@ static void sm501_plat_remove(struct platform_device *dev)
static const struct pci_device_id sm501_pci_tbl[] = {
{ PCI_DEVICE(0x126f, 0x0501) },
- { },
+ { }
};
MODULE_DEVICE_TABLE(pci, sm501_pci_tbl);
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index e75e1d6851ab..adf7a7ead3b6 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -845,7 +845,7 @@ static void timb_remove(struct pci_dev *dev)
static const struct pci_device_id timberdale_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_TIMB, PCI_DEVICE_ID_TIMB) },
- { 0 }
+ { }
};
MODULE_DEVICE_TABLE(pci, timberdale_pci_tbl);
diff --git a/drivers/mfd/vx855.c b/drivers/mfd/vx855.c
index 985f81c1739c..623735be62ad 100644
--- a/drivers/mfd/vx855.c
+++ b/drivers/mfd/vx855.c
@@ -105,7 +105,7 @@ static void vx855_remove(struct pci_dev *pdev)
static const struct pci_device_id vx855_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855) },
- { 0, }
+ { }
};
MODULE_DEVICE_TABLE(pci, vx855_pci_tbl);
--
2.56.0.rc1
^ permalink raw reply [flat|nested] 29+ messages in thread