Skip to contentSkip to conversation

hwmon: (pmbus/mp2869) Two cleanups about device ids

PATCH Applied Uwe Kleine-König (The Capable Hub) 2 participants 5 messages May 12

Subsystems (2)
Hardware monitoring MPS MP2869 driver
lore
Share & tools
lore

Uwe Kleine-König (The Capable Hub)

author
#0 lore raw

cover hwmon: (pmbus/mp2869) Two cleanups about device ids

Hello,

I'm currently working on a change to modify i2c_device_id. While preparing the hwmon drivers for that (expect a patch series later) I found the pmbus/mp2869 driver to benefit from some more cleanup so this was split out of the bigger patches.

Best regards
Uwe

Uwe Kleine-König (The Capable Hub) (2):
hwmon: (pmbus/mp2869) Remove unused driver data
hwmon: (pmbus/mp2869) Drop unjustified __maybe_unused

 drivers/hwmon/pmbus/mp2869.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

base-commit: 254f49634ee16a731174d2ae34bc50bd5f45e731

Signature · 1 line
2.47.3
author
#1 lore raw

PATCH 1/2 hwmon: (pmbus/mp2869) Remove unused driver data

The driver doesn't make use of the i2c .driver_data and the of .data. So drop the useless and irritating assignments.

While touching all these lines, use named initializers for the i2c device ids and convert to the most common usage of spacing in such arrays.

Signed-off-by Uwe Kleine-König (The Capable Hub) <[email protected]>
---
 drivers/hwmon/pmbus/mp2869.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/hwmon/pmbus/mp2869.c +10 -10
index 4647892e5112..d345be920429 100644
@@ -632,20 +632,20 @@ static int mp2869_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id mp2869_id[] = {
-	{"mp2869", 0},
-	{"mp29608", 1},
-	{"mp29612", 2},
-	{"mp29816", 3},
-	{}
+	{ .name = "mp2869" },
+	{ .name = "mp29608" },
+	{ .name = "mp29612" },
+	{ .name = "mp29816" },
+	{ }
 };
 MODULE_DEVICE_TABLE(i2c, mp2869_id);
 
 static const struct of_device_id __maybe_unused mp2869_of_match[] = {
-	{.compatible = "mps,mp2869", .data = (void *)0},
-	{.compatible = "mps,mp29608", .data = (void *)1},
-	{.compatible = "mps,mp29612", .data = (void *)2},
-	{.compatible = "mps,mp29816", .data = (void *)3},
-	{}
+	{ .compatible = "mps,mp2869" },
+	{ .compatible = "mps,mp29608" },
+	{ .compatible = "mps,mp29612" },
+	{ .compatible = "mps,mp29816" },
+	{ }
 };
 MODULE_DEVICE_TABLE(of, mp2869_of_match);
Signature · 1 line
2.47.3
maintainer Applied
#2 lore raw

Re: [PATCH v1 1/2] hwmon: (pmbus/mp2869) Remove unused driver data

Quoted 8 lines · Uwe Kleine-König (The Capable Hub)

The driver doesn't make use of the i2c .driver_data and the of .data. So drop the useless and irritating assignments.

While touching all these lines, use named initializers for the i2c device ids and convert to the most common usage of spacing in such arrays.

Signed-off-by Uwe Kleine-König (The Capable Hub) <[email protected]>

Applied.

Thanks,
Guenter

author
#3 lore raw

PATCH 2/2 hwmon: (pmbus/mp2869) Drop unjustified __maybe_unused

In reply to Uwe Kleine-König (The Capable Hub)

mp2869_of_match is used unconditionally in mp2869_driver, so there is no need for the __maybe_unused marker.

Signed-off-by Uwe Kleine-König (The Capable Hub) <[email protected]>
---
 drivers/hwmon/pmbus/mp2869.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/pmbus/mp2869.c +1 -1
index d345be920429..76c6017507b3 100644
@@ -640,7 +640,7 @@ static const struct i2c_device_id mp2869_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, mp2869_id);
 
-static const struct of_device_id __maybe_unused mp2869_of_match[] = {
+static const struct of_device_id mp2869_of_match[] = {
 	{ .compatible = "mps,mp2869" },
 	{ .compatible = "mps,mp29608" },
 	{ .compatible = "mps,mp29612" },
Signature · 1 line
2.47.3
maintainer Applied
#4 lore raw

Re: [PATCH v1 2/2] hwmon: (pmbus/mp2869) Drop unjustified __maybe_unused

Quoted 4 lines · Uwe Kleine-König (The Capable Hub)

mp2869_of_match is used unconditionally in mp2869_driver, so there is no need for the __maybe_unused marker.

Signed-off-by Uwe Kleine-König (The Capable Hub) <[email protected]>

Applied.

Thanks,
Guenter