drivers/gpio/gpio-adp5585.c | 4 ++-- drivers/gpio/gpio-bd72720.c | 4 ++-- drivers/gpio/gpio-bd9571mwv.c | 4 ++-- drivers/gpio/gpio-cros-ec.c | 4 ++-- drivers/gpio/gpio-lp873x.c | 2 +- drivers/gpio/gpio-lp87565.c | 2 +- drivers/gpio/gpio-max77620.c | 2 +- drivers/gpio/gpio-max77759.c | 2 +- drivers/gpio/gpio-pxa.c | 18 +++++++++--------- drivers/gpio/gpio-tps65086.c | 2 +- drivers/gpio/gpio-tps65218.c | 2 +- drivers/gpio/gpio-tps65219.c | 4 ++-- drivers/gpio/gpio-tps65912.c | 2 +- drivers/gpio/gpio-ts5500.c | 8 ++++---- 14 files changed, 30 insertions(+), 30 deletions(-)
Hello,
this series targets to use named initializers for platform_device_id
arrays. In general these are better readable for humans and more robust
to changes in the respective struct definition.
This robustness is needed as I want to do
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -610,4 +610,7 @@ struct dmi_system_id {
struct platform_device_id {
char name[PLATFORM_NAME_SIZE];
- kernel_ulong_t driver_data;
+ union {
+ kernel_ulong_t driver_data;
+ const void *driver_data_ptr;
+ };
};
which allows dropping several casts and eases porting CHERI to mainline
linux. A possible follow-up change is the following example:
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index 5d61053e0596..03bc8e859d73 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -534,7 +534,7 @@ static struct irq_chip pxa_muxed_gpio_chip = {
static int pxa_gpio_nums(struct platform_device *pdev)
{
const struct platform_device_id *id = platform_get_device_id(pdev);
- struct pxa_gpio_id *pxa_id = (struct pxa_gpio_id *)id->driver_data;
+ struct pxa_gpio_id *pxa_id = id->driver_data_ptr;
int count = 0;
switch (pxa_id->type) {
@@ -708,14 +708,14 @@ static int pxa_gpio_probe(struct platform_device *pdev)
}
static const struct platform_device_id gpio_id_table[] = {
- { .name = "pxa25x-gpio", .driver_data = (unsigned long)&pxa25x_id },
- { .name = "pxa26x-gpio", .driver_data = (unsigned long)&pxa26x_id },
- { .name = "pxa27x-gpio", .driver_data = (unsigned long)&pxa27x_id },
- { .name = "pxa3xx-gpio", .driver_data = (unsigned long)&pxa3xx_id },
- { .name = "pxa93x-gpio", .driver_data = (unsigned long)&pxa93x_id },
- { .name = "mmp-gpio", .driver_data = (unsigned long)&mmp_id },
- { .name = "mmp2-gpio", .driver_data = (unsigned long)&mmp2_id },
- { .name = "pxa1928-gpio", .driver_data = (unsigned long)&pxa1928_id },
+ { .name = "pxa25x-gpio", .driver_data_ptr = &pxa25x_id },
+ { .name = "pxa26x-gpio", .driver_data_ptr = &pxa26x_id },
+ { .name = "pxa27x-gpio", .driver_data_ptr = &pxa27x_id },
+ { .name = "pxa3xx-gpio", .driver_data_ptr = &pxa3xx_id },
+ { .name = "pxa93x-gpio", .driver_data_ptr = &pxa93x_id },
+ { .name = "mmp-gpio", .driver_data_ptr = &mmp_id },
+ { .name = "mmp2-gpio", .driver_data_ptr = &mmp2_id },
+ { .name = "pxa1928-gpio", .driver_data_ptr = &pxa1928_id },
{ }
};
increasing readability due to less casting. Also this results in the
compiler warning:
drivers/gpio/gpio-pxa.c: In function ‘pxa_gpio_nums’:
drivers/gpio/gpio-pxa.c:537:38: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
537 | struct pxa_gpio_id *pxa_id = id->driver_data_ptr;
| ^~
which is a good thing as adding the needed const to fix this warning
improves type safety.
If you consider the last patch mostly churn, just drop it.
Best regards
Uwe
Uwe Kleine-König (The Capable Hub) (3):
gpio: cros-ec: Drop unused assignment of platform_device_id driver
data
gpio: Use named initializers for platform_device_id arrays
gpio: max77620: Unify usage of space and comma in platform_device_id
array
drivers/gpio/gpio-adp5585.c | 4 ++--
drivers/gpio/gpio-bd72720.c | 4 ++--
drivers/gpio/gpio-bd9571mwv.c | 4 ++--
drivers/gpio/gpio-cros-ec.c | 4 ++--
drivers/gpio/gpio-lp873x.c | 2 +-
drivers/gpio/gpio-lp87565.c | 2 +-
drivers/gpio/gpio-max77620.c | 2 +-
drivers/gpio/gpio-max77759.c | 2 +-
drivers/gpio/gpio-pxa.c | 18 +++++++++---------
drivers/gpio/gpio-tps65086.c | 2 +-
drivers/gpio/gpio-tps65218.c | 2 +-
drivers/gpio/gpio-tps65219.c | 4 ++--
drivers/gpio/gpio-tps65912.c | 2 +-
drivers/gpio/gpio-ts5500.c | 8 ++++----
14 files changed, 30 insertions(+), 30 deletions(-)
base-commit: e7e28506af98ce4e1059e5ec59334b335c00a246
--
2.47.3
On Wed, 27 May 2026 16:57:26 +0200, Uwe Kleine-König (The Capable Hub) wrote:
> this series targets to use named initializers for platform_device_id
> arrays. In general these are better readable for humans and more robust
> to changes in the respective struct definition.
>
> This robustness is needed as I want to do
>
> diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
> --- a/include/linux/mod_devicetable.h
> +++ b/include/linux/mod_devicetable.h
> @@ -610,4 +610,7 @@ struct dmi_system_id {
> struct platform_device_id {
> char name[PLATFORM_NAME_SIZE];
> - kernel_ulong_t driver_data;
> + union {
> + kernel_ulong_t driver_data;
> + const void *driver_data_ptr;
> + };
> };
>
> [...]
I fixed your SoB as requested and fixed up patch 2/3 as one of the drivers it
touched no longer exists in my tree.
[1/3] gpio: cros-ec: Drop unused assignment of platform_device_id driver data
https://git.kernel.org/brgl/c/516e4d886941568174f46985fbb7c960c516ada9
[2/3] gpio: Use named initializers for platform_device_id arrays
https://git.kernel.org/brgl/c/2d43fb71f4ecbd10649a277e8790e7ca27acfdfe
[3/3] gpio: max77620: Unify usage of space and comma in platform_device_id array
https://git.kernel.org/brgl/c/a8754838f83a9905af516f38dd2633744a94f71a
Best regards,
--
Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Hello Bartosz,
On Thu, May 28, 2026 at 10:47:55AM +0200, Bartosz Golaszewski wrote:
> On Wed, 27 May 2026 16:57:26 +0200, Uwe Kleine-König (The Capable Hub) wrote:
> > this series targets to use named initializers for platform_device_id
> > arrays. In general these are better readable for humans and more robust
> > to changes in the respective struct definition.
> >
> > This robustness is needed as I want to do
> >
> > diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
> > --- a/include/linux/mod_devicetable.h
> > +++ b/include/linux/mod_devicetable.h
> > @@ -610,4 +610,7 @@ struct dmi_system_id {
> > struct platform_device_id {
> > char name[PLATFORM_NAME_SIZE];
> > - kernel_ulong_t driver_data;
> > + union {
> > + kernel_ulong_t driver_data;
> > + const void *driver_data_ptr;
> > + };
> > };
> >
> > [...]
>
> I fixed your SoB as requested and fixed up patch 2/3 as one of the drivers it
> touched no longer exists in my tree.
Right, I noticed that conflict when rebasing my stack to next-20260527
and assumed you'd cope for that.
Thanks!
Uwe
On Wed, May 27, 2026 at 4:57 PM Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com> wrote: > this series targets to use named initializers for platform_device_id > arrays. In general these are better readable for humans and more robust > to changes in the respective struct definition. The series: Reviewed-by: Linus Walleij <linusw@kernel.org> I agree with the goal of these patch series and the end result makes the kernel a better place. Yours, Linus Walleij
© 2016 - 2026 Red Hat, Inc.