* [PATCH] gpio: Initialize i2c_device_id arrays using member names
@ 2026-05-12 15:21 Uwe Kleine-König (The Capable Hub)
2026-05-18 7:47 ` Bartosz Golaszewski
0 siblings, 1 reply; 4+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-05-12 15:21 UTC (permalink / raw)
To: Linus Walleij, Bartosz Golaszewski; +Cc: linux-gpio, linux-kernel
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. The former was confirmed with x86 and arm64
builds.
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
---
Hello,
I didn't find a GPIO driver that benefits from the continuation of my
quest with the union in struct i2c_device_id.
See
https://lore.kernel.org/all/cover.1778582187.git.u.kleine-koenig@baylibre.com/
for an example in a different subsystem.
But even without that, I consider the changes done here beneficial.
Best regards
Uwe
drivers/gpio/gpio-max732x.c | 20 +++++-----
drivers/gpio/gpio-pca953x.c | 80 ++++++++++++++++++-------------------
drivers/gpio/gpio-pca9570.c | 6 +--
drivers/gpio/gpio-pcf857x.c | 26 ++++++------
4 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c
index 281ba1740a6a..24c67c912954 100644
--- a/drivers/gpio/gpio-max732x.c
+++ b/drivers/gpio/gpio-max732x.c
@@ -103,16 +103,16 @@ static uint64_t max732x_features[] = {
};
static const struct i2c_device_id max732x_id[] = {
- { "max7319", MAX7319 },
- { "max7320", MAX7320 },
- { "max7321", MAX7321 },
- { "max7322", MAX7322 },
- { "max7323", MAX7323 },
- { "max7324", MAX7324 },
- { "max7325", MAX7325 },
- { "max7326", MAX7326 },
- { "max7327", MAX7327 },
- { },
+ { .name = "max7319", .driver_data = MAX7319 },
+ { .name = "max7320", .driver_data = MAX7320 },
+ { .name = "max7321", .driver_data = MAX7321 },
+ { .name = "max7322", .driver_data = MAX7322 },
+ { .name = "max7323", .driver_data = MAX7323 },
+ { .name = "max7324", .driver_data = MAX7324 },
+ { .name = "max7325", .driver_data = MAX7325 },
+ { .name = "max7326", .driver_data = MAX7326 },
+ { .name = "max7327", .driver_data = MAX7327 },
+ { }
};
MODULE_DEVICE_TABLE(i2c, max732x_id);
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 52e96cc5f67b..94bb1a9f9268 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -86,49 +86,49 @@
#define PCA_CHIP_TYPE(x) ((x) & PCA_TYPE_MASK)
static const struct i2c_device_id pca953x_id[] = {
- { "pca6408", 8 | PCA953X_TYPE | PCA_INT, },
- { "pca6416", 16 | PCA953X_TYPE | PCA_INT, },
- { "pca9505", 40 | PCA953X_TYPE | PCA_INT, },
- { "pca9506", 40 | PCA953X_TYPE | PCA_INT, },
- { "pca9534", 8 | PCA953X_TYPE | PCA_INT, },
- { "pca9535", 16 | PCA953X_TYPE | PCA_INT, },
- { "pca9536", 4 | PCA953X_TYPE, },
- { "pca9537", 4 | PCA953X_TYPE | PCA_INT, },
- { "pca9538", 8 | PCA953X_TYPE | PCA_INT, },
- { "pca9539", 16 | PCA953X_TYPE | PCA_INT, },
- { "pca9554", 8 | PCA953X_TYPE | PCA_INT, },
- { "pca9555", 16 | PCA953X_TYPE | PCA_INT, },
- { "pca9556", 8 | PCA953X_TYPE, },
- { "pca9557", 8 | PCA953X_TYPE, },
- { "pca9574", 8 | PCA957X_TYPE | PCA_INT, },
- { "pca9575", 16 | PCA957X_TYPE | PCA_INT, },
- { "pca9698", 40 | PCA953X_TYPE, },
+ { .name = "pca6408", .driver_data = 8 | PCA953X_TYPE | PCA_INT },
+ { .name = "pca6416", .driver_data = 16 | PCA953X_TYPE | PCA_INT },
+ { .name = "pca9505", .driver_data = 40 | PCA953X_TYPE | PCA_INT },
+ { .name = "pca9506", .driver_data = 40 | PCA953X_TYPE | PCA_INT },
+ { .name = "pca9534", .driver_data = 8 | PCA953X_TYPE | PCA_INT },
+ { .name = "pca9535", .driver_data = 16 | PCA953X_TYPE | PCA_INT },
+ { .name = "pca9536", .driver_data = 4 | PCA953X_TYPE },
+ { .name = "pca9537", .driver_data = 4 | PCA953X_TYPE | PCA_INT },
+ { .name = "pca9538", .driver_data = 8 | PCA953X_TYPE | PCA_INT },
+ { .name = "pca9539", .driver_data = 16 | PCA953X_TYPE | PCA_INT },
+ { .name = "pca9554", .driver_data = 8 | PCA953X_TYPE | PCA_INT },
+ { .name = "pca9555", .driver_data = 16 | PCA953X_TYPE | PCA_INT },
+ { .name = "pca9556", .driver_data = 8 | PCA953X_TYPE },
+ { .name = "pca9557", .driver_data = 8 | PCA953X_TYPE },
+ { .name = "pca9574", .driver_data = 8 | PCA957X_TYPE | PCA_INT },
+ { .name = "pca9575", .driver_data = 16 | PCA957X_TYPE | PCA_INT },
+ { .name = "pca9698", .driver_data = 40 | PCA953X_TYPE },
- { "pcal6408", 8 | PCA953X_TYPE | PCA_LATCH_INT, },
- { "pcal6416", 16 | PCA953X_TYPE | PCA_LATCH_INT, },
- { "pcal6524", 24 | PCA953X_TYPE | PCA_LATCH_INT, },
- { "pcal6534", 34 | PCAL653X_TYPE | PCA_LATCH_INT, },
- { "pcal9535", 16 | PCA953X_TYPE | PCA_LATCH_INT, },
- { "pcal9554b", 8 | PCA953X_TYPE | PCA_LATCH_INT, },
- { "pcal9555a", 16 | PCA953X_TYPE | PCA_LATCH_INT, },
+ { .name = "pcal6408", .driver_data = 8 | PCA953X_TYPE | PCA_LATCH_INT },
+ { .name = "pcal6416", .driver_data = 16 | PCA953X_TYPE | PCA_LATCH_INT },
+ { .name = "pcal6524", .driver_data = 24 | PCA953X_TYPE | PCA_LATCH_INT },
+ { .name = "pcal6534", .driver_data = 34 | PCAL653X_TYPE | PCA_LATCH_INT },
+ { .name = "pcal9535", .driver_data = 16 | PCA953X_TYPE | PCA_LATCH_INT },
+ { .name = "pcal9554b", .driver_data = 8 | PCA953X_TYPE | PCA_LATCH_INT },
+ { .name = "pcal9555a", .driver_data = 16 | PCA953X_TYPE | PCA_LATCH_INT },
- { "max7310", 8 | PCA953X_TYPE, },
- { "max7312", 16 | PCA953X_TYPE | PCA_INT, },
- { "max7313", 16 | PCA953X_TYPE | PCA_INT, },
- { "max7315", 8 | PCA953X_TYPE | PCA_INT, },
- { "max7318", 16 | PCA953X_TYPE | PCA_INT, },
- { "pca6107", 8 | PCA953X_TYPE | PCA_INT, },
- { "tca6408", 8 | PCA953X_TYPE | PCA_INT, },
- { "tca6416", 16 | PCA953X_TYPE | PCA_INT, },
- { "tca6418", 18 | TCA6418_TYPE | PCA_INT, },
- { "tca6424", 24 | PCA953X_TYPE | PCA_INT, },
- { "tca9538", 8 | PCA953X_TYPE | PCA_INT, },
- { "tca9539", 16 | PCA953X_TYPE | PCA_INT, },
- { "tca9554", 8 | PCA953X_TYPE | PCA_INT, },
- { "xra1202", 8 | PCA953X_TYPE },
+ { .name = "max7310", .driver_data = 8 | PCA953X_TYPE },
+ { .name = "max7312", .driver_data = 16 | PCA953X_TYPE | PCA_INT },
+ { .name = "max7313", .driver_data = 16 | PCA953X_TYPE | PCA_INT },
+ { .name = "max7315", .driver_data = 8 | PCA953X_TYPE | PCA_INT },
+ { .name = "max7318", .driver_data = 16 | PCA953X_TYPE | PCA_INT },
+ { .name = "pca6107", .driver_data = 8 | PCA953X_TYPE | PCA_INT },
+ { .name = "tca6408", .driver_data = 8 | PCA953X_TYPE | PCA_INT },
+ { .name = "tca6416", .driver_data = 16 | PCA953X_TYPE | PCA_INT },
+ { .name = "tca6418", .driver_data = 18 | TCA6418_TYPE | PCA_INT },
+ { .name = "tca6424", .driver_data = 24 | PCA953X_TYPE | PCA_INT },
+ { .name = "tca9538", .driver_data = 8 | PCA953X_TYPE | PCA_INT },
+ { .name = "tca9539", .driver_data = 16 | PCA953X_TYPE | PCA_INT },
+ { .name = "tca9554", .driver_data = 8 | PCA953X_TYPE | PCA_INT },
+ { .name = "xra1202", .driver_data = 8 | PCA953X_TYPE },
- { "tcal6408", 8 | PCA953X_TYPE | PCA_LATCH_INT, },
- { "tcal6416", 16 | PCA953X_TYPE | PCA_LATCH_INT, },
+ { .name = "tcal6408", .driver_data = 8 | PCA953X_TYPE | PCA_LATCH_INT },
+ { .name = "tcal6416", .driver_data = 16 | PCA953X_TYPE | PCA_LATCH_INT },
{ }
};
MODULE_DEVICE_TABLE(i2c, pca953x_id);
diff --git a/drivers/gpio/gpio-pca9570.c b/drivers/gpio/gpio-pca9570.c
index 4a368803fb03..7a47a9aa0414 100644
--- a/drivers/gpio/gpio-pca9570.c
+++ b/drivers/gpio/gpio-pca9570.c
@@ -163,9 +163,9 @@ static const struct pca9570_chip_data slg7xl45106_gpio = {
};
static const struct i2c_device_id pca9570_id_table[] = {
- { "pca9570", (kernel_ulong_t)&pca9570_gpio},
- { "pca9571", (kernel_ulong_t)&pca9571_gpio },
- { "slg7xl45106", (kernel_ulong_t)&slg7xl45106_gpio },
+ { .name = "pca9570", .driver_data = (kernel_ulong_t)&pca9570_gpio },
+ { .name = "pca9571", .driver_data = (kernel_ulong_t)&pca9571_gpio },
+ { .name = "slg7xl45106", .driver_data = (kernel_ulong_t)&slg7xl45106_gpio },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(i2c, pca9570_id_table);
diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
index 3b9de8c3d924..c942b959571b 100644
--- a/drivers/gpio/gpio-pcf857x.c
+++ b/drivers/gpio/gpio-pcf857x.c
@@ -20,19 +20,19 @@
#include <linux/spinlock.h>
static const struct i2c_device_id pcf857x_id[] = {
- { "pcf8574", 8 },
- { "pcf8574a", 8 },
- { "pca8574", 8 },
- { "pca9670", 8 },
- { "pca9672", 8 },
- { "pca9674", 8 },
- { "pcf8575", 16 },
- { "pca8575", 16 },
- { "pca9671", 16 },
- { "pca9673", 16 },
- { "pca9675", 16 },
- { "max7328", 8 },
- { "max7329", 8 },
+ { .name = "pcf8574", .driver_data = 8 },
+ { .name = "pcf8574a", .driver_data = 8 },
+ { .name = "pca8574", .driver_data = 8 },
+ { .name = "pca9670", .driver_data = 8 },
+ { .name = "pca9672", .driver_data = 8 },
+ { .name = "pca9674", .driver_data = 8 },
+ { .name = "pcf8575", .driver_data = 16 },
+ { .name = "pca8575", .driver_data = 16 },
+ { .name = "pca9671", .driver_data = 16 },
+ { .name = "pca9673", .driver_data = 16 },
+ { .name = "pca9675", .driver_data = 16 },
+ { .name = "max7328", .driver_data = 8 },
+ { .name = "max7329", .driver_data = 8 },
{ }
};
MODULE_DEVICE_TABLE(i2c, pcf857x_id);
base-commit: 254f49634ee16a731174d2ae34bc50bd5f45e731
--
2.47.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] gpio: Initialize i2c_device_id arrays using member names
2026-05-12 15:21 [PATCH] gpio: Initialize i2c_device_id arrays using member names Uwe Kleine-König (The Capable Hub)
@ 2026-05-18 7:47 ` Bartosz Golaszewski
2026-05-19 15:54 ` Uwe Kleine-König (The Capable Hub)
0 siblings, 1 reply; 4+ messages in thread
From: Bartosz Golaszewski @ 2026-05-18 7:47 UTC (permalink / raw)
To: Linus Walleij, Bartosz Golaszewski,
Uwe Kleine-König (The Capable Hub)
Cc: Bartosz Golaszewski, linux-gpio, linux-kernel
On Tue, 12 May 2026 17:21:25 +0200, 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
> i2c_device_id that replaces .driver_data by an anonymous union.
>
> [...]
Applied, thanks!
[1/1] gpio: Initialize i2c_device_id arrays using member names
https://git.kernel.org/brgl/c/553e26a45e0e66698c1e0043b705933102ac3edc
Best regards,
--
Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] gpio: Initialize i2c_device_id arrays using member names
2026-05-18 7:47 ` Bartosz Golaszewski
@ 2026-05-19 15:54 ` Uwe Kleine-König (The Capable Hub)
2026-05-20 6:51 ` Bartosz Golaszewski
0 siblings, 1 reply; 4+ messages in thread
From: Uwe Kleine-König (The Capable Hub) @ 2026-05-19 15:54 UTC (permalink / raw)
To: Bartosz Golaszewski, Linus Walleij
Cc: Bartosz Golaszewski, linux-gpio, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 4217 bytes --]
Hello Bartosz,
On Mon, May 18, 2026 at 09:47:45AM +0200, Bartosz Golaszewski wrote:
>
> On Tue, 12 May 2026 17:21:25 +0200, 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
> > i2c_device_id that replaces .driver_data by an anonymous union.
> >
> > [...]
>
> Applied, thanks!
>
> [1/1] gpio: Initialize i2c_device_id arrays using member names
> https://git.kernel.org/brgl/c/553e26a45e0e66698c1e0043b705933102ac3edc
in the meantime I improved my workflow to also adapt i2c_device_id
arrays that don't make use of .driver_data. For drivers/gpio that would
be:
diff --git a/drivers/gpio/gpio-adnp.c b/drivers/gpio/gpio-adnp.c
index e5ac2d211013..27a80d1143a1 100644
--- a/drivers/gpio/gpio-adnp.c
+++ b/drivers/gpio/gpio-adnp.c
@@ -499,8 +499,8 @@ static int adnp_i2c_probe(struct i2c_client *client)
}
static const struct i2c_device_id adnp_i2c_id[] = {
- { "gpio-adnp" },
- { },
+ { .name = "gpio-adnp" },
+ { }
};
MODULE_DEVICE_TABLE(i2c, adnp_i2c_id);
diff --git a/drivers/gpio/gpio-ds4520.c b/drivers/gpio/gpio-ds4520.c
index f52ecae382a4..5add662a7ef5 100644
--- a/drivers/gpio/gpio-ds4520.c
+++ b/drivers/gpio/gpio-ds4520.c
@@ -54,7 +54,7 @@ static const struct of_device_id ds4520_gpio_of_match_table[] = {
MODULE_DEVICE_TABLE(of, ds4520_gpio_of_match_table);
static const struct i2c_device_id ds4520_gpio_id_table[] = {
- { "ds4520-gpio" },
+ { .name = "ds4520-gpio" },
{ }
};
MODULE_DEVICE_TABLE(i2c, ds4520_gpio_id_table);
diff --git a/drivers/gpio/gpio-fxl6408.c b/drivers/gpio/gpio-fxl6408.c
index afc1b8461dab..45b02d36e66f 100644
--- a/drivers/gpio/gpio-fxl6408.c
+++ b/drivers/gpio/gpio-fxl6408.c
@@ -150,7 +150,7 @@ static const __maybe_unused struct of_device_id fxl6408_dt_ids[] = {
MODULE_DEVICE_TABLE(of, fxl6408_dt_ids);
static const struct i2c_device_id fxl6408_id[] = {
- { "fxl6408" },
+ { .name = "fxl6408" },
{ }
};
MODULE_DEVICE_TABLE(i2c, fxl6408_id);
diff --git a/drivers/gpio/gpio-gw-pld.c b/drivers/gpio/gpio-gw-pld.c
index 2e5d97b7363f..bf1f91c3c4a8 100644
--- a/drivers/gpio/gpio-gw-pld.c
+++ b/drivers/gpio/gpio-gw-pld.c
@@ -109,7 +109,7 @@ static int gw_pld_probe(struct i2c_client *client)
}
static const struct i2c_device_id gw_pld_id[] = {
- { "gw-pld", },
+ { .name = "gw-pld" },
{ }
};
MODULE_DEVICE_TABLE(i2c, gw_pld_id);
diff --git a/drivers/gpio/gpio-max7300.c b/drivers/gpio/gpio-max7300.c
index 621d609ece90..62f2434c0d79 100644
--- a/drivers/gpio/gpio-max7300.c
+++ b/drivers/gpio/gpio-max7300.c
@@ -53,7 +53,7 @@ static void max7300_remove(struct i2c_client *client)
}
static const struct i2c_device_id max7300_id[] = {
- { "max7300" },
+ { .name = "max7300" },
{ }
};
MODULE_DEVICE_TABLE(i2c, max7300_id);
diff --git a/drivers/gpio/gpio-tpic2810.c b/drivers/gpio/gpio-tpic2810.c
index 866ff2d436d5..c38538653e99 100644
--- a/drivers/gpio/gpio-tpic2810.c
+++ b/drivers/gpio/gpio-tpic2810.c
@@ -112,7 +112,7 @@ static int tpic2810_probe(struct i2c_client *client)
}
static const struct i2c_device_id tpic2810_id_table[] = {
- { "tpic2810", },
+ { .name = "tpic2810" },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(i2c, tpic2810_id_table);
diff --git a/drivers/gpio/gpio-ts4900.c b/drivers/gpio/gpio-ts4900.c
index d9ee8fc77ccd..b46b48e56c56 100644
--- a/drivers/gpio/gpio-ts4900.c
+++ b/drivers/gpio/gpio-ts4900.c
@@ -175,7 +175,7 @@ static int ts4900_gpio_probe(struct i2c_client *client)
}
static const struct i2c_device_id ts4900_gpio_id_table[] = {
- { "ts4900-gpio", },
+ { .name = "ts4900-gpio" },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(i2c, ts4900_gpio_id_table);
These changes would fit to be squashed into the patch you merged. Would
you prefer to do that, or should I put these changes into a separate
patch?
Best regards
Uwe
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-05-20 6:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-05-12 15:21 [PATCH] gpio: Initialize i2c_device_id arrays using member names Uwe Kleine-König (The Capable Hub)
2026-05-18 7:47 ` Bartosz Golaszewski
2026-05-19 15:54 ` Uwe Kleine-König (The Capable Hub)
2026-05-20 6:51 ` Bartosz Golaszewski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox