| Message ID | 20240918123150.1540161-7-u.kleine-koenig@baylibre.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | hwmon: Drop explicit initialization of struct i2c_device_id::driver_data to 0 | expand |
On Wed, Sep 18, 2024 at 02:31:49PM +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. > > While touching these structs, also remove commas after the sentinel > entries and use a consistent indention style. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> Applied. Thanks, Guenter > --- > drivers/hwmon/amc6821.c | 2 +- > drivers/hwmon/pmbus/mp2891.c | 4 ++-- > drivers/hwmon/pmbus/mp2993.c | 4 ++-- > drivers/hwmon/pmbus/mp9941.c | 4 ++-- > drivers/hwmon/sg2042-mcu.c | 4 ++-- > drivers/hwmon/spd5118.c | 2 +- > 6 files changed, 10 insertions(+), 10 deletions(-) > > > base-commit: 55bcd2e0d04c1171d382badef1def1fd04ef66c5 > > diff --git a/drivers/hwmon/amc6821.c b/drivers/hwmon/amc6821.c > index ac64b407ed0e..e86027f850c9 100644 > --- a/drivers/hwmon/amc6821.c > +++ b/drivers/hwmon/amc6821.c > @@ -927,7 +927,7 @@ static int amc6821_probe(struct i2c_client *client) > } > > static const struct i2c_device_id amc6821_id[] = { > - { "amc6821", 0 }, > + { "amc6821" }, > { } > }; > > diff --git a/drivers/hwmon/pmbus/mp2891.c b/drivers/hwmon/pmbus/mp2891.c > index bb28b15a9103..94ab4ae5fba0 100644 > --- a/drivers/hwmon/pmbus/mp2891.c > +++ b/drivers/hwmon/pmbus/mp2891.c > @@ -572,8 +572,8 @@ static int mp2891_probe(struct i2c_client *client) > } > > static const struct i2c_device_id mp2891_id[] = { > - {"mp2891", 0}, > - {} > + { "mp2891" }, > + { } > }; > MODULE_DEVICE_TABLE(i2c, mp2891_id); > > diff --git a/drivers/hwmon/pmbus/mp2993.c b/drivers/hwmon/pmbus/mp2993.c > index 944593e13231..63691dac2281 100644 > --- a/drivers/hwmon/pmbus/mp2993.c > +++ b/drivers/hwmon/pmbus/mp2993.c > @@ -233,8 +233,8 @@ static int mp2993_probe(struct i2c_client *client) > } > > static const struct i2c_device_id mp2993_id[] = { > - {"mp2993", 0}, > - {} > + { "mp2993" }, > + { } > }; > MODULE_DEVICE_TABLE(i2c, mp2993_id); > > diff --git a/drivers/hwmon/pmbus/mp9941.c b/drivers/hwmon/pmbus/mp9941.c > index 543955cfce67..8ab5fc4d4092 100644 > --- a/drivers/hwmon/pmbus/mp9941.c > +++ b/drivers/hwmon/pmbus/mp9941.c > @@ -291,8 +291,8 @@ static int mp9941_probe(struct i2c_client *client) > } > > static const struct i2c_device_id mp9941_id[] = { > - {"mp9941", 0}, > - {} > + { "mp9941" }, > + { } > }; > MODULE_DEVICE_TABLE(i2c, mp9941_id); > > diff --git a/drivers/hwmon/sg2042-mcu.c b/drivers/hwmon/sg2042-mcu.c > index 141045769354..aa3fb773602c 100644 > --- a/drivers/hwmon/sg2042-mcu.c > +++ b/drivers/hwmon/sg2042-mcu.c > @@ -346,8 +346,8 @@ static void sg2042_mcu_i2c_remove(struct i2c_client *client) > } > > static const struct i2c_device_id sg2042_mcu_id[] = { > - { "sg2042-hwmon-mcu", 0 }, > - {}, > + { "sg2042-hwmon-mcu" }, > + { } > }; > MODULE_DEVICE_TABLE(i2c, sg2042_mcu_id); > > diff --git a/drivers/hwmon/spd5118.c b/drivers/hwmon/spd5118.c > index fcbce5a01e55..6cee48a3e5c3 100644 > --- a/drivers/hwmon/spd5118.c > +++ b/drivers/hwmon/spd5118.c > @@ -671,7 +671,7 @@ static int spd5118_resume(struct device *dev) > static DEFINE_SIMPLE_DEV_PM_OPS(spd5118_pm_ops, spd5118_suspend, spd5118_resume); > > static const struct i2c_device_id spd5118_id[] = { > - { "spd5118", 0 }, > + { "spd5118" }, > { } > }; > MODULE_DEVICE_TABLE(i2c, spd5118_id);
diff --git a/drivers/hwmon/amc6821.c b/drivers/hwmon/amc6821.c index ac64b407ed0e..e86027f850c9 100644 --- a/drivers/hwmon/amc6821.c +++ b/drivers/hwmon/amc6821.c @@ -927,7 +927,7 @@ static int amc6821_probe(struct i2c_client *client) } static const struct i2c_device_id amc6821_id[] = { - { "amc6821", 0 }, + { "amc6821" }, { } }; diff --git a/drivers/hwmon/pmbus/mp2891.c b/drivers/hwmon/pmbus/mp2891.c index bb28b15a9103..94ab4ae5fba0 100644 --- a/drivers/hwmon/pmbus/mp2891.c +++ b/drivers/hwmon/pmbus/mp2891.c @@ -572,8 +572,8 @@ static int mp2891_probe(struct i2c_client *client) } static const struct i2c_device_id mp2891_id[] = { - {"mp2891", 0}, - {} + { "mp2891" }, + { } }; MODULE_DEVICE_TABLE(i2c, mp2891_id); diff --git a/drivers/hwmon/pmbus/mp2993.c b/drivers/hwmon/pmbus/mp2993.c index 944593e13231..63691dac2281 100644 --- a/drivers/hwmon/pmbus/mp2993.c +++ b/drivers/hwmon/pmbus/mp2993.c @@ -233,8 +233,8 @@ static int mp2993_probe(struct i2c_client *client) } static const struct i2c_device_id mp2993_id[] = { - {"mp2993", 0}, - {} + { "mp2993" }, + { } }; MODULE_DEVICE_TABLE(i2c, mp2993_id); diff --git a/drivers/hwmon/pmbus/mp9941.c b/drivers/hwmon/pmbus/mp9941.c index 543955cfce67..8ab5fc4d4092 100644 --- a/drivers/hwmon/pmbus/mp9941.c +++ b/drivers/hwmon/pmbus/mp9941.c @@ -291,8 +291,8 @@ static int mp9941_probe(struct i2c_client *client) } static const struct i2c_device_id mp9941_id[] = { - {"mp9941", 0}, - {} + { "mp9941" }, + { } }; MODULE_DEVICE_TABLE(i2c, mp9941_id); diff --git a/drivers/hwmon/sg2042-mcu.c b/drivers/hwmon/sg2042-mcu.c index 141045769354..aa3fb773602c 100644 --- a/drivers/hwmon/sg2042-mcu.c +++ b/drivers/hwmon/sg2042-mcu.c @@ -346,8 +346,8 @@ static void sg2042_mcu_i2c_remove(struct i2c_client *client) } static const struct i2c_device_id sg2042_mcu_id[] = { - { "sg2042-hwmon-mcu", 0 }, - {}, + { "sg2042-hwmon-mcu" }, + { } }; MODULE_DEVICE_TABLE(i2c, sg2042_mcu_id); diff --git a/drivers/hwmon/spd5118.c b/drivers/hwmon/spd5118.c index fcbce5a01e55..6cee48a3e5c3 100644 --- a/drivers/hwmon/spd5118.c +++ b/drivers/hwmon/spd5118.c @@ -671,7 +671,7 @@ static int spd5118_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(spd5118_pm_ops, spd5118_suspend, spd5118_resume); static const struct i2c_device_id spd5118_id[] = { - { "spd5118", 0 }, + { "spd5118" }, { } }; MODULE_DEVICE_TABLE(i2c, spd5118_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. While touching these structs, also remove commas after the sentinel entries and use a consistent indention style. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> --- drivers/hwmon/amc6821.c | 2 +- drivers/hwmon/pmbus/mp2891.c | 4 ++-- drivers/hwmon/pmbus/mp2993.c | 4 ++-- drivers/hwmon/pmbus/mp9941.c | 4 ++-- drivers/hwmon/sg2042-mcu.c | 4 ++-- drivers/hwmon/spd5118.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) base-commit: 55bcd2e0d04c1171d382badef1def1fd04ef66c5