hwmon: use simple i2c probe

All these drivers have an i2c probe function which doesn't use the
"struct i2c_device_id *id" parameter, so they can trivially be
converted to the "probe_new" style of probe with a single argument.

This is part of an ongoing transition to single-argument i2c probe
functions. Old-style probe functions involve a call to i2c_match_id:
in drivers/i2c/i2c-core-base.c,

         /*
          * When there are no more users of probe(),
          * rename probe_new to probe.
          */
         if (driver->probe_new)
                 status = driver->probe_new(client);
         else if (driver->probe)
                 status = driver->probe(client,
                                        i2c_match_id(driver->id_table, client));
         else
                 status = -EINVAL;

Drivers which don't need the second parameter can be declared using
probe_new instead, avoiding the call to i2c_match_id. Drivers which do
can still be converted to probe_new-style, calling i2c_match_id
themselves (as is done currently for of_match_id).

This change was done using the following Coccinelle script, and fixed
up for whitespace changes:

@ rule1 @
identifier fn;
identifier client, id;
@@

- static int fn(struct i2c_client *client, const struct i2c_device_id *id)
+ static int fn(struct i2c_client *client)
{
...when != id
}

@ rule2 depends on rule1 @
identifier rule1.fn;
identifier driver;
@@

struct i2c_driver driver = {
-       .probe
+       .probe_new
                =
(
                   fn
|
-                  &fn
+                  fn
)
                ,
};

Signed-off-by: Stephen Kitt <steve@sk2.org>
Link: https://lore.kernel.org/r/20221011143309.3141267-1-steve@sk2.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/aht10.c b/drivers/hwmon/aht10.c
index 2d9770cb4401b75daed15c9f4d18a27bce29db54..d76f3441ecf1a5e9eed6ba92797b63645ed58f06 100644 (file)
--- a/drivers/hwmon/aht10.c
+++ b/drivers/hwmon/aht10.c
@@ -289,8 +289,7 @@ static const struct hwmon_chip_info aht10_chip_info = {
        .info = aht10_info,
 };
 
-static int aht10_probe(struct i2c_client *client,
-                      const struct i2c_device_id *aht10_id)
+static int aht10_probe(struct i2c_client *client)
 {
        struct device *device = &client->dev;
        struct device *hwmon_dev;
@@ -336,7 +335,7 @@ static struct i2c_driver aht10_driver = {
        .driver = {
                .name = "aht10",
        },
-       .probe      = aht10_probe,
+       .probe_new  = aht10_probe,
        .id_table   = aht10_id,
 };
 

diff --git a/drivers/hwmon/emc2305.c b/drivers/hwmon/emc2305.c
index aa1f25add0b6b3e175e5c318583b736c9ca0a532..f222fcf3b6aa1c03c72af4ff316f47275c215460 100644 (file)
--- a/drivers/hwmon/emc2305.c
+++ b/drivers/hwmon/emc2305.c
@@ -518,7 +518,7 @@ static int emc2305_identify(struct device *dev)
        return 0;
 }
 
-static int emc2305_probe(struct i2c_client *client, const struct i2c_device_id *id)
+static int emc2305_probe(struct i2c_client *client)
 {
        struct i2c_adapter *adapter = client->adapter;
        struct device *dev = &client->dev;
@@ -607,7 +607,7 @@ static struct i2c_driver emc2305_driver = {
        .driver = {
                .name = "emc2305",
        },
-       .probe    = emc2305_probe,
+       .probe_new = emc2305_probe,
        .remove   = emc2305_remove,
        .id_table = emc2305_ids,
        .address_list = emc2305_normal_i2c,

diff --git a/drivers/hwmon/ltc2992.c b/drivers/hwmon/ltc2992.c
index 72489d5d7eaf9734403009e1c1408f8630451ca9..88514152d9306f98460fd8405ec48ad60c4fa025 100644 (file)
--- a/drivers/hwmon/ltc2992.c
+++ b/drivers/hwmon/ltc2992.c
@@ -881,7 +881,7 @@ static int ltc2992_parse_dt(struct ltc2992_state *st)
        return 0;
 }
 
-static int ltc2992_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)
+static int ltc2992_i2c_probe(struct i2c_client *client)
 {
        struct device *hwmon_dev;
        struct ltc2992_state *st;
@@ -927,7 +927,7 @@ static struct i2c_driver ltc2992_i2c_driver = {
                .name = "ltc2992",
                .of_match_table = ltc2992_of_match,
        },
-       .probe    = ltc2992_i2c_probe,
+       .probe_new = ltc2992_i2c_probe,
        .id_table = ltc2992_i2c_id,
 };
 

diff --git a/drivers/hwmon/max127.c b/drivers/hwmon/max127.c
index 402ffdc2f425b104d685ce60129499beb08013e3..0e21e7e6bbd2e5e690debb0e9bc71c51ce96a46e 100644 (file)
--- a/drivers/hwmon/max127.c
+++ b/drivers/hwmon/max127.c
@@ -303,8 +303,7 @@ static const struct hwmon_chip_info max127_chip_info = {
        .info = max127_info,
 };
 
-static int max127_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int max127_probe(struct i2c_client *client)
 {
        int i;
        struct device *hwmon_dev;
@@ -340,7 +339,7 @@ static struct i2c_driver max127_driver = {
        .driver = {
                .name   = "max127",
        },
-       .probe          = max127_probe,
+       .probe_new      = max127_probe,
        .id_table       = max127_id,
 };
 

diff --git a/drivers/hwmon/sbrmi.c b/drivers/hwmon/sbrmi.c
index 7bf0c3fba75fef2897558420f2aefe034c3aab0d..8ea5a4d3219fff725ddce54deab189546b28edb3 100644 (file)
--- a/drivers/hwmon/sbrmi.c
+++ b/drivers/hwmon/sbrmi.c
@@ -297,8 +297,7 @@ static int sbrmi_get_max_pwr_limit(struct sbrmi_data *data)
        return ret;
 }
 
-static int sbrmi_probe(struct i2c_client *client,
-                      const struct i2c_device_id *id)
+static int sbrmi_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct device *hwmon_dev;
@@ -348,7 +347,7 @@ static struct i2c_driver sbrmi_driver = {
                .name = "sbrmi",
                .of_match_table = of_match_ptr(sbrmi_of_match),
        },
-       .probe = sbrmi_probe,
+       .probe_new = sbrmi_probe,
        .id_table = sbrmi_id,
 };
 

diff --git a/drivers/hwmon/sbtsi_temp.c b/drivers/hwmon/sbtsi_temp.c
index e35357c48b8e609a80a71f1366aee2ecac03f142..4c37de846f93bebb521ebaead3e5b8aece22d289 100644 (file)
--- a/drivers/hwmon/sbtsi_temp.c
+++ b/drivers/hwmon/sbtsi_temp.c
@@ -199,8 +199,7 @@ static const struct hwmon_chip_info sbtsi_chip_info = {
        .info = sbtsi_info,
 };
 
-static int sbtsi_probe(struct i2c_client *client,
-                      const struct i2c_device_id *id)
+static int sbtsi_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct device *hwmon_dev;
@@ -239,7 +238,7 @@ static struct i2c_driver sbtsi_driver = {
                .name = "sbtsi",
                .of_match_table = of_match_ptr(sbtsi_of_match),
        },
-       .probe = sbtsi_probe,
+       .probe_new = sbtsi_probe,
        .id_table = sbtsi_id,
 };
 

diff --git a/drivers/hwmon/sht4x.c b/drivers/hwmon/sht4x.c
index 13ac2d8f22c79b77817e1faa2a3f6c1090977caf..13e042927bf89ee7589664d7f41d716ce14dbbb4 100644 (file)
--- a/drivers/hwmon/sht4x.c
+++ b/drivers/hwmon/sht4x.c
@@ -232,8 +232,7 @@ static const struct hwmon_chip_info sht4x_chip_info = {
        .info = sht4x_info,
 };
 
-static int sht4x_probe(struct i2c_client *client,
-                      const struct i2c_device_id *sht4x_id)
+static int sht4x_probe(struct i2c_client *client)
 {
        struct device *device = &client->dev;
        struct device *hwmon_dev;
@@ -292,7 +291,7 @@ static struct i2c_driver sht4x_driver = {
                .name = "sht4x",
                .of_match_table = sht4x_of_match,
        },
-       .probe          = sht4x_probe,
+       .probe_new      = sht4x_probe,
        .id_table       = sht4x_id,
 };