From: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Date: Mon, 18 May 2026 13:55:36 +0000 (+0200)
Subject: usb: misc: Use named initializers for struct i2c_device_id
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=555f100cb85347dd84ab2d89cc0cdf5f5f70c1dd;p=thirdparty%2Flinux.git

usb: misc: Use named initializers for struct i2c_device_id

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.

While touching all these arrays, unify usage of whitespace in the list
terminator.

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>
Reviewed-by: Richard Leitner <richard.leitner@linux.dev>
Link: https://patch.msgid.link/20260518135536.781168-2-u.kleine-koenig@baylibre.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c
index 7c0778631bea..fb0693742f01 100644
--- a/drivers/usb/misc/usb251xb.c
+++ b/drivers/usb/misc/usb251xb.c
@@ -746,15 +746,15 @@ static int usb251xb_i2c_resume(struct device *dev)
 static DEFINE_SIMPLE_DEV_PM_OPS(usb251xb_i2c_pm_ops, usb251xb_i2c_suspend, usb251xb_i2c_resume);
 
 static const struct i2c_device_id usb251xb_id[] = {
-	{ "usb2422" },
-	{ "usb2512b" },
-	{ "usb2512bi" },
-	{ "usb2513b" },
-	{ "usb2513bi" },
-	{ "usb2514b" },
-	{ "usb2514bi" },
-	{ "usb2517" },
-	{ "usb2517i" },
+	{ .name = "usb2422" },
+	{ .name = "usb2512b" },
+	{ .name = "usb2512bi" },
+	{ .name = "usb2513b" },
+	{ .name = "usb2513bi" },
+	{ .name = "usb2514b" },
+	{ .name = "usb2514bi" },
+	{ .name = "usb2517" },
+	{ .name = "usb2517i" },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(i2c, usb251xb_id);
diff --git a/drivers/usb/misc/usb3503.c b/drivers/usb/misc/usb3503.c
index 322e59381b78..759770a13260 100644
--- a/drivers/usb/misc/usb3503.c
+++ b/drivers/usb/misc/usb3503.c
@@ -390,7 +390,7 @@ static SIMPLE_DEV_PM_OPS(usb3503_platform_pm_ops, usb3503_platform_suspend,
 		usb3503_platform_resume);
 
 static const struct i2c_device_id usb3503_id[] = {
-	{ USB3503_I2C_NAME },
+	{ .name = USB3503_I2C_NAME },
 	{ }
 };
 MODULE_DEVICE_TABLE(i2c, usb3503_id);
diff --git a/drivers/usb/misc/usb4604.c b/drivers/usb/misc/usb4604.c
index c9a2fb3518ae..2ae9656715e0 100644
--- a/drivers/usb/misc/usb4604.c
+++ b/drivers/usb/misc/usb4604.c
@@ -135,7 +135,7 @@ static SIMPLE_DEV_PM_OPS(usb4604_i2c_pm_ops, usb4604_i2c_suspend,
 		usb4604_i2c_resume);
 
 static const struct i2c_device_id usb4604_id[] = {
-	{ "usb4604" },
+	{ .name = "usb4604" },
 	{ }
 };
 MODULE_DEVICE_TABLE(i2c, usb4604_id);