| Message ID | 20240508072027.2119857-2-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | hwmon: Drop explicit initialization of struct i2c_device_id::driver_data to 0 (part 2) | expand |
On Wed, May 08, 2024 at 09:20:26AM +0200, Uwe Kleine-König wrote: > These drivers don't use the driver_data member of struct i2c_device_id, > so don't explicitly initialize this member. > > This prepares putting driver_data in an anonymous union which requires > either no initialization or named designators. But it's also a nice > cleanup on its own. > > This is a follow up to commit d8a66f3621c2 ("hwmon: Drop explicit > initialization of struct i2c_device_id::driver_data to 0") which I > created before identifying a few corner cases in my conversion script. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Applied. Thanks, Guenter
diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c index 03964127a12a..d2d970e73c61 100644 --- a/drivers/hwmon/lm87.c +++ b/drivers/hwmon/lm87.c @@ -976,7 +976,7 @@ static int lm87_probe(struct i2c_client *client) static const struct i2c_device_id lm87_id[] = { { "lm87" }, - { "adm1024", 0 }, + { "adm1024" }, { } }; MODULE_DEVICE_TABLE(i2c, lm87_id); diff --git a/drivers/hwmon/lm95241.c b/drivers/hwmon/lm95241.c index 4ad69a2de105..cad0a0ff8416 100644 --- a/drivers/hwmon/lm95241.c +++ b/drivers/hwmon/lm95241.c @@ -458,7 +458,7 @@ static int lm95241_probe(struct i2c_client *client) /* Driver data (common to all clients) */ static const struct i2c_device_id lm95241_id[] = { { "lm95231" }, - { "lm95241", 0 }, + { "lm95241" }, { } }; MODULE_DEVICE_TABLE(i2c, lm95241_id); diff --git a/drivers/hwmon/max6621.c b/drivers/hwmon/max6621.c index 05426cde0e36..a7066f3a0bb4 100644 --- a/drivers/hwmon/max6621.c +++ b/drivers/hwmon/max6621.c @@ -537,7 +537,7 @@ static int max6621_probe(struct i2c_client *client) } static const struct i2c_device_id max6621_id[] = { - { MAX6621_DRV_NAME, 0 }, + { MAX6621_DRV_NAME }, { } }; MODULE_DEVICE_TABLE(i2c, max6621_id); diff --git a/drivers/hwmon/pmbus/max15301.c b/drivers/hwmon/pmbus/max15301.c index c79cdf10bbec..986404fe6a31 100644 --- a/drivers/hwmon/pmbus/max15301.c +++ b/drivers/hwmon/pmbus/max15301.c @@ -23,8 +23,8 @@ #include "pmbus.h" static const struct i2c_device_id max15301_id[] = { - {"bmr461"}, - {"max15301", 0}, + { "bmr461" }, + { "max15301" }, {} }; MODULE_DEVICE_TABLE(i2c, max15301_id);
These drivers don't use the driver_data member of struct i2c_device_id, so don't explicitly initialize this member. This prepares putting driver_data in an anonymous union which requires either no initialization or named designators. But it's also a nice cleanup on its own. This is a follow up to commit d8a66f3621c2 ("hwmon: Drop explicit initialization of struct i2c_device_id::driver_data to 0") which I created before identifying a few corner cases in my conversion script. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- Hello, feel free to squash this change into d8a66f3621c2 if you prefer. Best regards Uwe drivers/hwmon/lm87.c | 2 +- drivers/hwmon/lm95241.c | 2 +- drivers/hwmon/max6621.c | 2 +- drivers/hwmon/pmbus/max15301.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) base-commit: 93a39e4766083050ca0ecd6a3548093a3b9eb60c