hwmon (pmbus) use simple i2c probe function

pmbus_do_probe doesn't use the id information provided in its second
argument, so this can be removed, which then allows using the
single-parameter i2c probe function ("probe_new") for probes.

This avoids scanning the identifier tables during probes.

Drivers which didn't use the id are converted as-is; drivers which did
are modified as follows:

* if the information in i2c_client is sufficient, that's used instead
  (client->name);
* configured v. probed comparisons are performed by comparing the
  configured name to the detected name, instead of the ids; this
  involves strcmp but is still cheaper than comparing all the device
  names when scanning the tables;
* anything else is handled by calling i2c_match_id() with the same
  level of error-handling (if any) as before.

Additionally, the mismatch message in the ltc2978 driver is adjusted
so that it no longer assumes that the driver_data is an index into
ltc2978_id.

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

diff --git a/Documentation/hwmon/pmbus-core.rst b/Documentation/hwmon/pmbus-core.rst
index 501b37b0610d8f7408ad7458c7bf3fe90f794653..e22c4f6808bc85a0c48975cfee05b58e2acddea8 100644 (file)
--- a/Documentation/hwmon/pmbus-core.rst
+++ b/Documentation/hwmon/pmbus-core.rst
@@ -270,8 +270,7 @@ obtain the chip status. Therefore, it must _not_ be called from that function.
 
 ::
 
-  int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
-                    struct pmbus_driver_info *info);
+  int pmbus_do_probe(struct i2c_client *client, struct pmbus_driver_info *info);
 
 Execute probe function. Similar to standard probe function for other drivers,
 with the pointer to struct pmbus_driver_info as additional argument. Calls

diff --git a/Documentation/hwmon/pmbus.rst b/Documentation/hwmon/pmbus.rst
index 67284bd5f4cd446c75fa5e386742e57c79c69a4d..fb3ad67dedc12a9525945b89d68ef9be4bd39f2f 100644 (file)
--- a/Documentation/hwmon/pmbus.rst
+++ b/Documentation/hwmon/pmbus.rst
@@ -143,10 +143,9 @@ Emerson DS1200 power modules might look as follows::
                   | PMBUS_HAVE_FAN12 | PMBUS_HAVE_STATUS_FAN12,
   };
 
-  static int ds1200_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+  static int ds1200_probe(struct i2c_client *client)
   {
-       return pmbus_do_probe(client, id, &ds1200_info);
+       return pmbus_do_probe(client, &ds1200_info);
   }
 
   static int ds1200_remove(struct i2c_client *client)
@@ -166,7 +165,7 @@ Emerson DS1200 power modules might look as follows::
        .driver = {
                   .name = "ds1200",
                   },
-       .probe = ds1200_probe,
+       .probe_new = ds1200_probe,
        .remove = ds1200_remove,
        .id_table = ds1200_id,
   };

diff --git a/drivers/hwmon/pmbus/adm1275.c b/drivers/hwmon/pmbus/adm1275.c
index 651846650a9c94aafd8029bc32ead31f0154b8c3..e7997f37b2666fcbab8a1347185ac58c7fbed3a5 100644 (file)
--- a/drivers/hwmon/pmbus/adm1275.c
+++ b/drivers/hwmon/pmbus/adm1275.c
@@ -462,8 +462,7 @@ static const struct i2c_device_id adm1275_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, adm1275_id);
 
-static int adm1275_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int adm1275_probe(struct i2c_client *client)
 {
        s32 (*config_read_fn)(const struct i2c_client *client, u8 reg);
        u8 block_buffer[I2C_SMBUS_BLOCK_MAX + 1];
@@ -506,10 +505,10 @@ static int adm1275_probe(struct i2c_client *client,
                return -ENODEV;
        }
 
-       if (id->driver_data != mid->driver_data)
+       if (strcmp(client->name, mid->name) != 0)
                dev_notice(&client->dev,
                           "Device mismatch: Configured %s, detected %s\n",
-                          id->name, mid->name);
+                          client->name, mid->name);
 
        if (mid->driver_data == adm1272 || mid->driver_data == adm1278 ||
            mid->driver_data == adm1293 || mid->driver_data == adm1294)
@@ -790,14 +789,14 @@ static int adm1275_probe(struct i2c_client *client,
                info->R[PSC_TEMPERATURE] = coefficients[tindex].R;
        }
 
-       return pmbus_do_probe(client, id, info);
+       return pmbus_do_probe(client, info);
 }
 
 static struct i2c_driver adm1275_driver = {
        .driver = {
                   .name = "adm1275",
                   },
-       .probe = adm1275_probe,
+       .probe_new = adm1275_probe,
        .remove = pmbus_do_remove,
        .id_table = adm1275_id,
 };

diff --git a/drivers/hwmon/pmbus/bel-pfe.c b/drivers/hwmon/pmbus/bel-pfe.c
index f236e18f45a59dae4f355984a42df561962a86bd..2c5b853d6c7fc3da69913c2ca4c86b3df1d0f9d2 100644 (file)
--- a/drivers/hwmon/pmbus/bel-pfe.c
+++ b/drivers/hwmon/pmbus/bel-pfe.c
@@ -87,12 +87,13 @@ static struct pmbus_driver_info pfe_driver_info[] = {
        },
 };
 
-static int pfe_pmbus_probe(struct i2c_client *client,
-                          const struct i2c_device_id *id)
+static const struct i2c_device_id pfe_device_id[];
+
+static int pfe_pmbus_probe(struct i2c_client *client)
 {
        int model;
 
-       model = (int)id->driver_data;
+       model = (int)i2c_match_id(pfe_device_id, client)->driver_data;
 
        /*
         * PFE3000-12-069RA devices may not stay in page 0 during device
@@ -104,7 +105,7 @@ static int pfe_pmbus_probe(struct i2c_client *client,
                i2c_smbus_write_byte_data(client, PMBUS_PAGE, 0);
        }
 
-       return pmbus_do_probe(client, id, &pfe_driver_info[model]);
+       return pmbus_do_probe(client, &pfe_driver_info[model]);
 }
 
 static const struct i2c_device_id pfe_device_id[] = {
@@ -119,7 +120,7 @@ static struct i2c_driver pfe_pmbus_driver = {
        .driver = {
                   .name = "bel-pfe",
        },
-       .probe = pfe_pmbus_probe,
+       .probe_new = pfe_pmbus_probe,
        .remove = pmbus_do_remove,
        .id_table = pfe_device_id,
 };

diff --git a/drivers/hwmon/pmbus/ibm-cffps.c b/drivers/hwmon/pmbus/ibm-cffps.c
index 7d300f2f338d7b3978cbc2d1925416bafbd175ce..2fb7540ee952b5984c1bc558cb99de4a12eb6a67 100644 (file)
--- a/drivers/hwmon/pmbus/ibm-cffps.c
+++ b/drivers/hwmon/pmbus/ibm-cffps.c
@@ -91,6 +91,8 @@ struct ibm_cffps {
        struct led_classdev led;
 };
 
+static const struct i2c_device_id ibm_cffps_id[];
+
 #define to_psu(x, y) container_of((x), struct ibm_cffps, debugfs_entries[(y)])
 
 static ssize_t ibm_cffps_read_input_history(struct ibm_cffps *psu,
@@ -473,8 +475,7 @@ static struct pmbus_platform_data ibm_cffps_pdata = {
        .flags = PMBUS_SKIP_STATUS_CHECK,
 };
 
-static int ibm_cffps_probe(struct i2c_client *client,
-                          const struct i2c_device_id *id)
+static int ibm_cffps_probe(struct i2c_client *client)
 {
        int i, rc;
        enum versions vs = cffps_unknown;
@@ -482,11 +483,15 @@ static int ibm_cffps_probe(struct i2c_client *client,
        struct dentry *ibm_cffps_dir;
        struct ibm_cffps *psu;
        const void *md = of_device_get_match_data(&client->dev);
+       const struct i2c_device_id *id;
 
-       if (md)
+       if (md) {
                vs = (enum versions)md;
-       else if (id)
-               vs = (enum versions)id->driver_data;
+       } else {
+               id = i2c_match_id(ibm_cffps_id, client);
+               if (id)
+                       vs = (enum versions)id->driver_data;
+       }
 
        if (vs == cffps_unknown) {
                u16 ccin_revision = 0;
@@ -519,7 +524,7 @@ static int ibm_cffps_probe(struct i2c_client *client,
        }
 
        client->dev.platform_data = &ibm_cffps_pdata;
-       rc = pmbus_do_probe(client, id, &ibm_cffps_info[vs]);
+       rc = pmbus_do_probe(client, &ibm_cffps_info[vs]);
        if (rc)
                return rc;
 
@@ -611,7 +616,7 @@ static struct i2c_driver ibm_cffps_driver = {
                .name = "ibm-cffps",
                .of_match_table = ibm_cffps_of_match,
        },
-       .probe = ibm_cffps_probe,
+       .probe_new = ibm_cffps_probe,
        .remove = pmbus_do_remove,
        .id_table = ibm_cffps_id,
 };

diff --git a/drivers/hwmon/pmbus/inspur-ipsps.c b/drivers/hwmon/pmbus/inspur-ipsps.c
index 42e01549184aa8e892dd52026dcc21638f3b6fa5..be493182174deb7921091be8ab1ce8a42b15ad66 100644 (file)
--- a/drivers/hwmon/pmbus/inspur-ipsps.c
+++ b/drivers/hwmon/pmbus/inspur-ipsps.c
@@ -190,11 +190,10 @@ static struct pmbus_platform_data ipsps_pdata = {
        .flags = PMBUS_SKIP_STATUS_CHECK,
 };
 
-static int ipsps_probe(struct i2c_client *client,
-                      const struct i2c_device_id *id)
+static int ipsps_probe(struct i2c_client *client)
 {
        client->dev.platform_data = &ipsps_pdata;
-       return pmbus_do_probe(client, id, &ipsps_info);
+       return pmbus_do_probe(client, &ipsps_info);
 }
 
 static const struct i2c_device_id ipsps_id[] = {
@@ -216,7 +215,7 @@ static struct i2c_driver ipsps_driver = {
                .name = "inspur-ipsps",
                .of_match_table = of_match_ptr(ipsps_of_match),
        },
-       .probe = ipsps_probe,
+       .probe_new = ipsps_probe,
        .remove = pmbus_do_remove,
        .id_table = ipsps_id,
 };

diff --git a/drivers/hwmon/pmbus/ir35221.c b/drivers/hwmon/pmbus/ir35221.c
index 3eea3e006a964bc51b558d4d8d837a860259e4c5..5fadb1def49fbfbec51938eb6ad33f9421917e1c 100644 (file)
--- a/drivers/hwmon/pmbus/ir35221.c
+++ b/drivers/hwmon/pmbus/ir35221.c
@@ -67,8 +67,7 @@ static int ir35221_read_word_data(struct i2c_client *client, int page,
        return ret;
 }
 
-static int ir35221_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int ir35221_probe(struct i2c_client *client)
 {
        struct pmbus_driver_info *info;
        u8 buf[I2C_SMBUS_BLOCK_MAX];
@@ -123,7 +122,7 @@ static int ir35221_probe(struct i2c_client *client,
                | PMBUS_HAVE_STATUS_INPUT | PMBUS_HAVE_STATUS_TEMP;
        info->func[1] = info->func[0];
 
-       return pmbus_do_probe(client, id, info);
+       return pmbus_do_probe(client, info);
 }
 
 static const struct i2c_device_id ir35221_id[] = {
@@ -137,7 +136,7 @@ static struct i2c_driver ir35221_driver = {
        .driver = {
                .name   = "ir35221",
        },
-       .probe          = ir35221_probe,
+       .probe_new      = ir35221_probe,
        .remove         = pmbus_do_remove,
        .id_table       = ir35221_id,
 };

diff --git a/drivers/hwmon/pmbus/ir38064.c b/drivers/hwmon/pmbus/ir38064.c
index 1820f5077f668aeacf6685c4623afa6856c95ee9..9ac563ce7dd8ab513cfe503a86cdf53e17027d59 100644 (file)
--- a/drivers/hwmon/pmbus/ir38064.c
+++ b/drivers/hwmon/pmbus/ir38064.c
@@ -35,10 +35,9 @@ static struct pmbus_driver_info ir38064_info = {
            | PMBUS_HAVE_POUT,
 };
 
-static int ir38064_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int ir38064_probe(struct i2c_client *client)
 {
-       return pmbus_do_probe(client, id, &ir38064_info);
+       return pmbus_do_probe(client, &ir38064_info);
 }
 
 static const struct i2c_device_id ir38064_id[] = {
@@ -53,7 +52,7 @@ static struct i2c_driver ir38064_driver = {
        .driver = {
                   .name = "ir38064",
                   },
-       .probe = ir38064_probe,
+       .probe_new = ir38064_probe,
        .remove = pmbus_do_remove,
        .id_table = ir38064_id,
 };

diff --git a/drivers/hwmon/pmbus/irps5401.c b/drivers/hwmon/pmbus/irps5401.c
index d37daa001fb30ddd42d23f032d1c24ae00695970..44aeafcbd56cbd2a13f15166c31b6644af08e91f 100644 (file)
--- a/drivers/hwmon/pmbus/irps5401.c
+++ b/drivers/hwmon/pmbus/irps5401.c
@@ -38,10 +38,9 @@ static struct pmbus_driver_info irps5401_info = {
        .func[4] = IRPS5401_LDO_FUNC,
 };
 
-static int irps5401_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int irps5401_probe(struct i2c_client *client)
 {
-       return pmbus_do_probe(client, id, &irps5401_info);
+       return pmbus_do_probe(client, &irps5401_info);
 }
 
 static const struct i2c_device_id irps5401_id[] = {
@@ -55,7 +54,7 @@ static struct i2c_driver irps5401_driver = {
        .driver = {
                   .name = "irps5401",
                   },
-       .probe = irps5401_probe,
+       .probe_new = irps5401_probe,
        .remove = pmbus_do_remove,
        .id_table = irps5401_id,
 };

diff --git a/drivers/hwmon/pmbus/isl68137.c b/drivers/hwmon/pmbus/isl68137.c
index 58aa95a3c010cd81139ee037a68d88b63c1ae712..7cad76e07f701bcc0ac9310a22dfa0963d037670 100644 (file)
--- a/drivers/hwmon/pmbus/isl68137.c
+++ b/drivers/hwmon/pmbus/isl68137.c
@@ -72,6 +72,8 @@ enum variants {
        raa_dmpvr2_hv,
 };
 
+static const struct i2c_device_id raa_dmpvr_id[];
+
 static ssize_t isl68137_avs_enable_show_page(struct i2c_client *client,
                                             int page,
                                             char *buf)
@@ -218,8 +220,7 @@ static struct pmbus_driver_info raa_dmpvr_info = {
            | PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_POUT,
 };
 
-static int isl68137_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int isl68137_probe(struct i2c_client *client)
 {
        struct pmbus_driver_info *info;
 
@@ -228,7 +229,7 @@ static int isl68137_probe(struct i2c_client *client,
                return -ENOMEM;
        memcpy(info, &raa_dmpvr_info, sizeof(*info));
 
-       switch (id->driver_data) {
+       switch (i2c_match_id(raa_dmpvr_id, client)->driver_data) {
        case raa_dmpvr1_2rail:
                info->pages = 2;
                info->R[PSC_VOLTAGE_IN] = 3;
@@ -267,7 +268,7 @@ static int isl68137_probe(struct i2c_client *client,
                return -ENODEV;
        }
 
-       return pmbus_do_probe(client, id, info);
+       return pmbus_do_probe(client, info);
 }
 
 static const struct i2c_device_id raa_dmpvr_id[] = {
@@ -322,7 +323,7 @@ static struct i2c_driver isl68137_driver = {
        .driver = {
                   .name = "isl68137",
                   },
-       .probe = isl68137_probe,
+       .probe_new = isl68137_probe,
        .remove = pmbus_do_remove,
        .id_table = raa_dmpvr_id,
 };

diff --git a/drivers/hwmon/pmbus/lm25066.c b/drivers/hwmon/pmbus/lm25066.c
index 9e4cf0800186a23af5b9604326896664db10fc0d..429172a42902c8181ffbe7e2b01875c9a3a2a449 100644 (file)
--- a/drivers/hwmon/pmbus/lm25066.c
+++ b/drivers/hwmon/pmbus/lm25066.c
@@ -211,6 +211,8 @@ struct lm25066_data {
 
 #define to_lm25066_data(x)  container_of(x, struct lm25066_data, info)
 
+static const struct i2c_device_id lm25066_id[];
+
 static int lm25066_read_word_data(struct i2c_client *client, int page,
                                  int phase, int reg)
 {
@@ -416,8 +418,7 @@ static int lm25066_write_word_data(struct i2c_client *client, int page, int reg,
        return ret;
 }
 
-static int lm25066_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int lm25066_probe(struct i2c_client *client)
 {
        int config;
        struct lm25066_data *data;
@@ -437,7 +438,7 @@ static int lm25066_probe(struct i2c_client *client,
        if (config < 0)
                return config;
 
-       data->id = id->driver_data;
+       data->id = i2c_match_id(lm25066_id, client)->driver_data;
        info = &data->info;
 
        info->pages = 1;
@@ -487,7 +488,7 @@ static int lm25066_probe(struct i2c_client *client,
                info->b[PSC_POWER] = coeff[PSC_POWER].b;
        }
 
-       return pmbus_do_probe(client, id, info);
+       return pmbus_do_probe(client, info);
 }
 
 static const struct i2c_device_id lm25066_id[] = {
@@ -506,7 +507,7 @@ static struct i2c_driver lm25066_driver = {
        .driver = {
                   .name = "lm25066",
                   },
-       .probe = lm25066_probe,
+       .probe_new = lm25066_probe,
        .remove = pmbus_do_remove,
        .id_table = lm25066_id,
 };

diff --git a/drivers/hwmon/pmbus/ltc2978.c b/drivers/hwmon/pmbus/ltc2978.c
index 7b0e6b37e247797881082133bf36441e589470ce..9a024cf70145fef82fbbfaf5dc7b36532eae3fe1 100644 (file)
--- a/drivers/hwmon/pmbus/ltc2978.c
+++ b/drivers/hwmon/pmbus/ltc2978.c
@@ -649,12 +649,12 @@ static int ltc2978_get_id(struct i2c_client *client)
        return -ENODEV;
 }
 
-static int ltc2978_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int ltc2978_probe(struct i2c_client *client)
 {
        int i, chip_id;
        struct ltc2978_data *data;
        struct pmbus_driver_info *info;
+       const struct i2c_device_id *id;
 
        if (!i2c_check_functionality(client->adapter,
                                     I2C_FUNC_SMBUS_READ_WORD_DATA))
@@ -670,11 +670,13 @@ static int ltc2978_probe(struct i2c_client *client,
                return chip_id;
 
        data->id = chip_id;
+       id = i2c_match_id(ltc2978_id, client);
        if (data->id != id->driver_data)
                dev_warn(&client->dev,
-                        "Device mismatch: Configured %s, detected %s\n",
+                        "Device mismatch: Configured %s (%d), detected %d\n",
                         id->name,
-                        ltc2978_id[data->id].name);
+                        (int) id->driver_data,
+                        chip_id);
 
        info = &data->info;
        info->write_word_data = ltc2978_write_word_data;
@@ -832,7 +834,7 @@ static int ltc2978_probe(struct i2c_client *client,
        }
 #endif
 
-       return pmbus_do_probe(client, id, info);
+       return pmbus_do_probe(client, info);
 }
 
 
@@ -872,7 +874,7 @@ static struct i2c_driver ltc2978_driver = {
                   .name = "ltc2978",
                   .of_match_table = of_match_ptr(ltc2978_of_match),
                   },
-       .probe = ltc2978_probe,
+       .probe_new = ltc2978_probe,
        .remove = pmbus_do_remove,
        .id_table = ltc2978_id,
 };

diff --git a/drivers/hwmon/pmbus/ltc3815.c b/drivers/hwmon/pmbus/ltc3815.c
index 3036263e0a6661fcde70565dfad4ef61b7322f64..8328fb367ad67e7de7b57b963a6a3604d80aea0b 100644 (file)
--- a/drivers/hwmon/pmbus/ltc3815.c
+++ b/drivers/hwmon/pmbus/ltc3815.c
@@ -178,8 +178,7 @@ static struct pmbus_driver_info ltc3815_info = {
        .write_word_data = ltc3815_write_word_data,
 };
 
-static int ltc3815_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int ltc3815_probe(struct i2c_client *client)
 {
        int chip_id;
 
@@ -193,14 +192,14 @@ static int ltc3815_probe(struct i2c_client *client,
        if ((chip_id & LTC3815_ID_MASK) != LTC3815_ID)
                return -ENODEV;
 
-       return pmbus_do_probe(client, id, &ltc3815_info);
+       return pmbus_do_probe(client, &ltc3815_info);
 }
 
 static struct i2c_driver ltc3815_driver = {
        .driver = {
                   .name = "ltc3815",
                   },
-       .probe = ltc3815_probe,
+       .probe_new = ltc3815_probe,
        .remove = pmbus_do_remove,
        .id_table = ltc3815_id,
 };

diff --git a/drivers/hwmon/pmbus/max16064.c b/drivers/hwmon/pmbus/max16064.c
index 288e93f74c286af803a70eb3bc649b08f87b1339..26e7f5ef9d7f28530f0b8fb658877edfeb3b8346 100644 (file)
--- a/drivers/hwmon/pmbus/max16064.c
+++ b/drivers/hwmon/pmbus/max16064.c
@@ -85,10 +85,9 @@ static struct pmbus_driver_info max16064_info = {
        .write_word_data = max16064_write_word_data,
 };
 
-static int max16064_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int max16064_probe(struct i2c_client *client)
 {
-       return pmbus_do_probe(client, id, &max16064_info);
+       return pmbus_do_probe(client, &max16064_info);
 }
 
 static const struct i2c_device_id max16064_id[] = {
@@ -103,7 +102,7 @@ static struct i2c_driver max16064_driver = {
        .driver = {
                   .name = "max16064",
                   },
-       .probe = max16064_probe,
+       .probe_new = max16064_probe,
        .remove = pmbus_do_remove,
        .id_table = max16064_id,
 };

diff --git a/drivers/hwmon/pmbus/max16601.c b/drivers/hwmon/pmbus/max16601.c
index 51cdfaf9023c8cbb93c3c3320301e2ad92ceb7f2..71bb74e27a5c8f32989857616d5e9153626a6d88 100644 (file)
--- a/drivers/hwmon/pmbus/max16601.c
+++ b/drivers/hwmon/pmbus/max16601.c
@@ -239,8 +239,7 @@ static void max16601_remove(void *_data)
        i2c_unregister_device(data->vsa);
 }
 
-static int max16601_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int max16601_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        u8 buf[I2C_SMBUS_BLOCK_MAX + 1];
@@ -288,7 +287,7 @@ static int max16601_probe(struct i2c_client *client,
 
        data->info = max16601_info;
 
-       return pmbus_do_probe(client, id, &data->info);
+       return pmbus_do_probe(client, &data->info);
 }
 
 static const struct i2c_device_id max16601_id[] = {
@@ -302,7 +301,7 @@ static struct i2c_driver max16601_driver = {
        .driver = {
                   .name = "max16601",
                   },
-       .probe = max16601_probe,
+       .probe_new = max16601_probe,
        .remove = pmbus_do_remove,
        .id_table = max16601_id,
 };

diff --git a/drivers/hwmon/pmbus/max20730.c b/drivers/hwmon/pmbus/max20730.c
index a151a2b588a5c64e41042d61a7fc0c73e382cdd3..9475261ddacb2c23126ba02457178efec114488c 100644 (file)
--- a/drivers/hwmon/pmbus/max20730.c
+++ b/drivers/hwmon/pmbus/max20730.c
@@ -37,6 +37,8 @@ struct max20730_data {
 
 #define MAX20730_MFR_DEVSET1   0xd2
 
+static const struct i2c_device_id max20730_id[];
+
 /*
  * Convert discreet value to direct data format. Strictly speaking, all passed
  * values are constants, so we could do that calculation manually. On the
@@ -295,8 +297,7 @@ static const struct pmbus_driver_info max20730_info[] = {
        },
 };
 
-static int max20730_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int max20730_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        u8 buf[I2C_SMBUS_BLOCK_MAX + 1];
@@ -356,7 +357,7 @@ static int max20730_probe(struct i2c_client *client,
        if (client->dev.of_node)
                chip_id = (enum chips)of_device_get_match_data(dev);
        else
-               chip_id = id->driver_data;
+               chip_id = i2c_match_id(max20730_id, client)->driver_data;
 
        data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
        if (!data)
@@ -370,7 +371,7 @@ static int max20730_probe(struct i2c_client *client,
                return ret;
        data->mfr_devset1 = ret;
 
-       return pmbus_do_probe(client, id, &data->info);
+       return pmbus_do_probe(client, &data->info);
 }
 
 static const struct i2c_device_id max20730_id[] = {
@@ -398,7 +399,7 @@ static struct i2c_driver max20730_driver = {
                .name = "max20730",
                .of_match_table = max20730_of_match,
        },
-       .probe = max20730_probe,
+       .probe_new = max20730_probe,
        .remove = pmbus_do_remove,
        .id_table = max20730_id,
 };

diff --git a/drivers/hwmon/pmbus/max20751.c b/drivers/hwmon/pmbus/max20751.c
index da3c38cb9a5cdd19eced253eaf0eecc9eb8620e4..921e92d82aec898809aa531bc111a487dceb3b61 100644 (file)
--- a/drivers/hwmon/pmbus/max20751.c
+++ b/drivers/hwmon/pmbus/max20751.c
@@ -26,10 +26,9 @@ static struct pmbus_driver_info max20751_info = {
                PMBUS_HAVE_POUT,
 };
 
-static int max20751_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int max20751_probe(struct i2c_client *client)
 {
-       return pmbus_do_probe(client, id, &max20751_info);
+       return pmbus_do_probe(client, &max20751_info);
 }
 
 static const struct i2c_device_id max20751_id[] = {
@@ -43,7 +42,7 @@ static struct i2c_driver max20751_driver = {
        .driver = {
                   .name = "max20751",
                   },
-       .probe = max20751_probe,
+       .probe_new = max20751_probe,
        .remove = pmbus_do_remove,
        .id_table = max20751_id,
 };

diff --git a/drivers/hwmon/pmbus/max31785.c b/drivers/hwmon/pmbus/max31785.c
index d9aa5c873d21ecb527421e2204b6971465edb752..839b957bc03e71281cce4863259f57dd80a489f0 100644 (file)
--- a/drivers/hwmon/pmbus/max31785.c
+++ b/drivers/hwmon/pmbus/max31785.c
@@ -324,8 +324,7 @@ static int max31785_configure_dual_tach(struct i2c_client *client,
        return 0;
 }
 
-static int max31785_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int max31785_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct pmbus_driver_info *info;
@@ -354,7 +353,7 @@ static int max31785_probe(struct i2c_client *client,
        if (ret == MAX31785A) {
                dual_tach = true;
        } else if (ret == MAX31785) {
-               if (!strcmp("max31785a", id->name))
+               if (!strcmp("max31785a", client->name))
                        dev_warn(dev, "Expected max3175a, found max31785: cannot provide secondary tachometer readings\n");
        } else {
                return -ENODEV;
@@ -366,7 +365,7 @@ static int max31785_probe(struct i2c_client *client,
                        return ret;
        }
 
-       return pmbus_do_probe(client, id, info);
+       return pmbus_do_probe(client, info);
 }
 
 static const struct i2c_device_id max31785_id[] = {
@@ -390,7 +389,7 @@ static struct i2c_driver max31785_driver = {
                .name = "max31785",
                .of_match_table = max31785_of_match,
        },
-       .probe = max31785_probe,
+       .probe_new = max31785_probe,
        .remove = pmbus_do_remove,
        .id_table = max31785_id,
 };

diff --git a/drivers/hwmon/pmbus/max34440.c b/drivers/hwmon/pmbus/max34440.c
index de04dff28945b8e8dad2de255bd0c8d305dc503e..8ea31b59f8e8f7761a58e289b4430319774e67aa 100644 (file)
--- a/drivers/hwmon/pmbus/max34440.c
+++ b/drivers/hwmon/pmbus/max34440.c
@@ -41,6 +41,8 @@ struct max34440_data {
 
 #define to_max34440_data(x)  container_of(x, struct max34440_data, info)
 
+static const struct i2c_device_id max34440_id[];
+
 static int max34440_read_word_data(struct i2c_client *client, int page,
                                   int phase, int reg)
 {
@@ -458,8 +460,7 @@ static struct pmbus_driver_info max34440_info[] = {
        },
 };
 
-static int max34440_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int max34440_probe(struct i2c_client *client)
 {
        struct max34440_data *data;
        int rv;
@@ -468,8 +469,8 @@ static int max34440_probe(struct i2c_client *client,
                            GFP_KERNEL);
        if (!data)
                return -ENOMEM;
-       data->id = id->driver_data;
-       data->info = max34440_info[id->driver_data];
+       data->id = i2c_match_id(max34440_id, client)->driver_data;
+       data->info = max34440_info[data->id];
 
        if (data->id == max34451) {
                rv = max34451_set_supported_funcs(client, data);
@@ -477,7 +478,7 @@ static int max34440_probe(struct i2c_client *client,
                        return rv;
        }
 
-       return pmbus_do_probe(client, id, &data->info);
+       return pmbus_do_probe(client, &data->info);
 }
 
 static const struct i2c_device_id max34440_id[] = {
@@ -496,7 +497,7 @@ static struct i2c_driver max34440_driver = {
        .driver = {
                   .name = "max34440",
                   },
-       .probe = max34440_probe,
+       .probe_new = max34440_probe,
        .remove = pmbus_do_remove,
        .id_table = max34440_id,
 };

diff --git a/drivers/hwmon/pmbus/max8688.c b/drivers/hwmon/pmbus/max8688.c
index 643ccfc051067fac399599d0a2360202319fcb04..4b2239a6afd3785ed8d6d3da7b35fe503e15270b 100644 (file)
--- a/drivers/hwmon/pmbus/max8688.c
+++ b/drivers/hwmon/pmbus/max8688.c
@@ -165,10 +165,9 @@ static struct pmbus_driver_info max8688_info = {
        .write_word_data = max8688_write_word_data,
 };
 
-static int max8688_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int max8688_probe(struct i2c_client *client)
 {
-       return pmbus_do_probe(client, id, &max8688_info);
+       return pmbus_do_probe(client, &max8688_info);
 }
 
 static const struct i2c_device_id max8688_id[] = {
@@ -183,7 +182,7 @@ static struct i2c_driver max8688_driver = {
        .driver = {
                   .name = "max8688",
                   },
-       .probe = max8688_probe,
+       .probe_new = max8688_probe,
        .remove = pmbus_do_remove,
        .id_table = max8688_id,
 };

diff --git a/drivers/hwmon/pmbus/pmbus.c b/drivers/hwmon/pmbus/pmbus.c
index 6d384e8ee1db192ffe8a1ee5412f222827de94bd..20f1af9165c2d9fa535014ea4bf96a6dcb1e698e 100644 (file)
--- a/drivers/hwmon/pmbus/pmbus.c
+++ b/drivers/hwmon/pmbus/pmbus.c
@@ -20,6 +20,8 @@ struct pmbus_device_info {
        u32 flags;
 };
 
+static const struct i2c_device_id pmbus_id[];
+
 /*
  * Find sensor groups and status registers on each page.
  */
@@ -159,8 +161,7 @@ abort:
        return ret;
 }
 
-static int pmbus_probe(struct i2c_client *client,
-                      const struct i2c_device_id *id)
+static int pmbus_probe(struct i2c_client *client)
 {
        struct pmbus_driver_info *info;
        struct pmbus_platform_data *pdata = NULL;
@@ -171,7 +172,7 @@ static int pmbus_probe(struct i2c_client *client,
        if (!info)
                return -ENOMEM;
 
-       device_info = (struct pmbus_device_info *)id->driver_data;
+       device_info = (struct pmbus_device_info *)i2c_match_id(pmbus_id, client)->driver_data;
        if (device_info->flags & PMBUS_SKIP_STATUS_CHECK) {
                pdata = devm_kzalloc(dev, sizeof(struct pmbus_platform_data),
                                     GFP_KERNEL);
@@ -185,7 +186,7 @@ static int pmbus_probe(struct i2c_client *client,
        info->identify = pmbus_identify;
        dev->platform_data = pdata;
 
-       return pmbus_do_probe(client, id, info);
+       return pmbus_do_probe(client, info);
 }
 
 static const struct pmbus_device_info pmbus_info_one = {
@@ -236,7 +237,7 @@ static struct i2c_driver pmbus_driver = {
        .driver = {
                   .name = "pmbus",
                   },
-       .probe = pmbus_probe,
+       .probe_new = pmbus_probe,
        .remove = pmbus_do_remove,
        .id_table = pmbus_id,
 };

diff --git a/drivers/hwmon/pmbus/pmbus.h b/drivers/hwmon/pmbus/pmbus.h
index 6d9f2cf70bffb08fdeaf9e3e6b5e2fa5a0c37594..88a5df2633fb254cbbf6474eae59899eb7ec0081 100644 (file)
--- a/drivers/hwmon/pmbus/pmbus.h
+++ b/drivers/hwmon/pmbus/pmbus.h
@@ -489,8 +489,7 @@ int pmbus_update_byte_data(struct i2c_client *client, int page, u8 reg,
 void pmbus_clear_faults(struct i2c_client *client);
 bool pmbus_check_byte_register(struct i2c_client *client, int page, int reg);
 bool pmbus_check_word_register(struct i2c_client *client, int page, int reg);
-int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
-                  struct pmbus_driver_info *info);
+int pmbus_do_probe(struct i2c_client *client, struct pmbus_driver_info *info);
 int pmbus_do_remove(struct i2c_client *client);
 const struct pmbus_driver_info *pmbus_get_driver_info(struct i2c_client
                                                      *client);

diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
index 89ea7da1403ff54b7bb9a828bc09721a518804ce..987de6d857bc696937c22c7ef37ec3e2924e4d45 100644 (file)
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
@@ -2521,8 +2521,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
 }
 #endif /* IS_ENABLED(CONFIG_DEBUG_FS) */
 
-int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
-                  struct pmbus_driver_info *info)
+int pmbus_do_probe(struct i2c_client *client, struct pmbus_driver_info *info)
 {
        struct device *dev = &client->dev;
        const struct pmbus_platform_data *pdata = dev_get_platdata(dev);

diff --git a/drivers/hwmon/pmbus/pxe1610.c b/drivers/hwmon/pmbus/pxe1610.c
index 517584cff3deabdbae3134ed0049263d0c39627d..fa5c5dd29b7ae047d17d3ad212ee081dcba30edf 100644 (file)
--- a/drivers/hwmon/pmbus/pxe1610.c
+++ b/drivers/hwmon/pmbus/pxe1610.c
@@ -78,8 +78,7 @@ static struct pmbus_driver_info pxe1610_info = {
        .identify = pxe1610_identify,
 };
 
-static int pxe1610_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int pxe1610_probe(struct i2c_client *client)
 {
        struct pmbus_driver_info *info;
        u8 buf[I2C_SMBUS_BLOCK_MAX];
@@ -115,7 +114,7 @@ static int pxe1610_probe(struct i2c_client *client,
        if (!info)
                return -ENOMEM;
 
-       return pmbus_do_probe(client, id, info);
+       return pmbus_do_probe(client, info);
 }
 
 static const struct i2c_device_id pxe1610_id[] = {
@@ -131,7 +130,7 @@ static struct i2c_driver pxe1610_driver = {
        .driver = {
                        .name = "pxe1610",
                        },
-       .probe = pxe1610_probe,
+       .probe_new = pxe1610_probe,
        .remove = pmbus_do_remove,
        .id_table = pxe1610_id,
 };

diff --git a/drivers/hwmon/pmbus/tps40422.c b/drivers/hwmon/pmbus/tps40422.c
index 2b83dcda964a255d1880b8d6c7ec1aff5da5ad88..edbdfa809d51d7692d50924d6da77d4cfb1baaa2 100644 (file)
--- a/drivers/hwmon/pmbus/tps40422.c
+++ b/drivers/hwmon/pmbus/tps40422.c
@@ -25,10 +25,9 @@ static struct pmbus_driver_info tps40422_info = {
                | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT,
 };
 
-static int tps40422_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int tps40422_probe(struct i2c_client *client)
 {
-       return pmbus_do_probe(client, id, &tps40422_info);
+       return pmbus_do_probe(client, &tps40422_info);
 }
 
 static const struct i2c_device_id tps40422_id[] = {
@@ -43,7 +42,7 @@ static struct i2c_driver tps40422_driver = {
        .driver = {
                   .name = "tps40422",
                   },
-       .probe = tps40422_probe,
+       .probe_new = tps40422_probe,
        .remove = pmbus_do_remove,
        .id_table = tps40422_id,
 };

diff --git a/drivers/hwmon/pmbus/tps53679.c b/drivers/hwmon/pmbus/tps53679.c
index 157c99ffb52bde51a39bde1776b2b172c545c570..db2bdf2a1f023a86559f0c853c9192956571b5a0 100644 (file)
--- a/drivers/hwmon/pmbus/tps53679.c
+++ b/drivers/hwmon/pmbus/tps53679.c
@@ -34,6 +34,8 @@ enum chips {
 
 #define TPS53681_MFR_SPECIFIC_20       0xe4    /* Number of phases, per page */
 
+static const struct i2c_device_id tps53679_id[];
+
 static int tps53679_identify_mode(struct i2c_client *client,
                                  struct pmbus_driver_info *info)
 {
@@ -183,8 +185,7 @@ static struct pmbus_driver_info tps53679_info = {
        .pfunc[5] = PMBUS_HAVE_IOUT,
 };
 
-static int tps53679_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int tps53679_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct pmbus_driver_info *info;
@@ -193,7 +194,7 @@ static int tps53679_probe(struct i2c_client *client,
        if (dev->of_node)
                chip_id = (enum chips)of_device_get_match_data(dev);
        else
-               chip_id = id->driver_data;
+               chip_id = i2c_match_id(tps53679_id, client)->driver_data;
 
        info = devm_kmemdup(dev, &tps53679_info, sizeof(*info), GFP_KERNEL);
        if (!info)
@@ -220,7 +221,7 @@ static int tps53679_probe(struct i2c_client *client,
                return -ENODEV;
        }
 
-       return pmbus_do_probe(client, id, info);
+       return pmbus_do_probe(client, info);
 }
 
 static const struct i2c_device_id tps53679_id[] = {
@@ -249,7 +250,7 @@ static struct i2c_driver tps53679_driver = {
                .name = "tps53679",
                .of_match_table = of_match_ptr(tps53679_of_match),
        },
-       .probe = tps53679_probe,
+       .probe_new = tps53679_probe,
        .remove = pmbus_do_remove,
        .id_table = tps53679_id,
 };

diff --git a/drivers/hwmon/pmbus/ucd9000.c b/drivers/hwmon/pmbus/ucd9000.c
index 81f4c4f166cd1c93372677afc6483f19d75d30ef..f8017993e2b4dd2005a58b1245e78cb4c4162477 100644 (file)
--- a/drivers/hwmon/pmbus/ucd9000.c
+++ b/drivers/hwmon/pmbus/ucd9000.c
@@ -487,8 +487,7 @@ static int ucd9000_init_debugfs(struct i2c_client *client,
 }
 #endif /* CONFIG_DEBUG_FS */
 
-static int ucd9000_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int ucd9000_probe(struct i2c_client *client)
 {
        u8 block_buffer[I2C_SMBUS_BLOCK_MAX + 1];
        struct ucd9000_data *data;
@@ -523,12 +522,12 @@ static int ucd9000_probe(struct i2c_client *client,
        if (client->dev.of_node)
                chip = (enum chips)of_device_get_match_data(&client->dev);
        else
-               chip = id->driver_data;
+               chip = mid->driver_data;
 
-       if (chip != ucd9000 && chip != mid->driver_data)
+       if (chip != ucd9000 && strcmp(client->name, mid->name) != 0)
                dev_notice(&client->dev,
                           "Device mismatch: Configured %s, detected %s\n",
-                          id->name, mid->name);
+                          client->name, mid->name);
 
        data = devm_kzalloc(&client->dev, sizeof(struct ucd9000_data),
                            GFP_KERNEL);
@@ -603,7 +602,7 @@ static int ucd9000_probe(struct i2c_client *client,
 
        ucd9000_probe_gpio(client, mid, data);
 
-       ret = pmbus_do_probe(client, mid, info);
+       ret = pmbus_do_probe(client, info);
        if (ret)
                return ret;
 
@@ -621,7 +620,7 @@ static struct i2c_driver ucd9000_driver = {
                .name = "ucd9000",
                .of_match_table = of_match_ptr(ucd9000_of_match),
        },
-       .probe = ucd9000_probe,
+       .probe_new = ucd9000_probe,
        .remove = pmbus_do_remove,
        .id_table = ucd9000_id,
 };

diff --git a/drivers/hwmon/pmbus/ucd9200.c b/drivers/hwmon/pmbus/ucd9200.c
index 7c04745a97098003976c4f7050ec30615e94b072..e111e25e1619a3a13e5d485b07b6ccf7c39f630e 100644 (file)
--- a/drivers/hwmon/pmbus/ucd9200.c
+++ b/drivers/hwmon/pmbus/ucd9200.c
@@ -71,8 +71,7 @@ static const struct of_device_id __maybe_unused ucd9200_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, ucd9200_of_match);
 
-static int ucd9200_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int ucd9200_probe(struct i2c_client *client)
 {
        u8 block_buffer[I2C_SMBUS_BLOCK_MAX + 1];
        struct pmbus_driver_info *info;
@@ -106,12 +105,12 @@ static int ucd9200_probe(struct i2c_client *client,
        if (client->dev.of_node)
                chip = (enum chips)of_device_get_match_data(&client->dev);
        else
-               chip = id->driver_data;
+               chip = mid->driver_data;
 
-       if (chip != ucd9200 && chip != mid->driver_data)
+       if (chip != ucd9200 && strcmp(client->name, mid->name) != 0)
                dev_notice(&client->dev,
                           "Device mismatch: Configured %s, detected %s\n",
-                          id->name, mid->name);
+                          client->name, mid->name);
 
        info = devm_kzalloc(&client->dev, sizeof(struct pmbus_driver_info),
                            GFP_KERNEL);
@@ -192,7 +191,7 @@ static int ucd9200_probe(struct i2c_client *client,
        if (mid->driver_data == ucd9240)
                info->func[0] |= PMBUS_HAVE_FAN12 | PMBUS_HAVE_STATUS_FAN12;
 
-       return pmbus_do_probe(client, mid, info);
+       return pmbus_do_probe(client, info);
 }
 
 /* This is the driver that will be inserted */
@@ -201,7 +200,7 @@ static struct i2c_driver ucd9200_driver = {
                .name = "ucd9200",
                .of_match_table = of_match_ptr(ucd9200_of_match),
        },
-       .probe = ucd9200_probe,
+       .probe_new = ucd9200_probe,
        .remove = pmbus_do_remove,
        .id_table = ucd9200_id,
 };

diff --git a/drivers/hwmon/pmbus/xdpe12284.c b/drivers/hwmon/pmbus/xdpe12284.c
index d5103fc9e269493e63172e5fcc8329620d59adcc..c95ac934fde416818d321138c405b3700f52e749 100644 (file)
--- a/drivers/hwmon/pmbus/xdpe12284.c
+++ b/drivers/hwmon/pmbus/xdpe12284.c
@@ -127,8 +127,7 @@ static struct pmbus_driver_info xdpe122_info = {
        .read_word_data = xdpe122_read_word_data,
 };
 
-static int xdpe122_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int xdpe122_probe(struct i2c_client *client)
 {
        struct pmbus_driver_info *info;
 
@@ -137,7 +136,7 @@ static int xdpe122_probe(struct i2c_client *client,
        if (!info)
                return -ENOMEM;
 
-       return pmbus_do_probe(client, id, info);
+       return pmbus_do_probe(client, info);
 }
 
 static const struct i2c_device_id xdpe122_id[] = {
@@ -160,7 +159,7 @@ static struct i2c_driver xdpe122_driver = {
                .name = "xdpe12284",
                .of_match_table = of_match_ptr(xdpe122_of_match),
        },
-       .probe = xdpe122_probe,
+       .probe_new = xdpe122_probe,
        .remove = pmbus_do_remove,
        .id_table = xdpe122_id,
 };

diff --git a/drivers/hwmon/pmbus/zl6100.c b/drivers/hwmon/pmbus/zl6100.c
index 3a827d0a881df058b5dbabc0477d9b9262086b66..e8bda340482be850860fd5168016002f4a040fb1 100644 (file)
--- a/drivers/hwmon/pmbus/zl6100.c
+++ b/drivers/hwmon/pmbus/zl6100.c
@@ -301,8 +301,7 @@ static const struct i2c_device_id zl6100_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, zl6100_id);
 
-static int zl6100_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int zl6100_probe(struct i2c_client *client)
 {
        int ret;
        struct zl6100_data *data;
@@ -333,10 +332,10 @@ static int zl6100_probe(struct i2c_client *client,
                dev_err(&client->dev, "Unsupported device\n");
                return -ENODEV;
        }
-       if (id->driver_data != mid->driver_data)
+       if (strcmp(client->name, mid->name) != 0)
                dev_notice(&client->dev,
                           "Device mismatch: Configured %s, detected %s\n",
-                          id->name, mid->name);
+                          client->name, mid->name);
 
        data = devm_kzalloc(&client->dev, sizeof(struct zl6100_data),
                            GFP_KERNEL);
@@ -389,14 +388,14 @@ static int zl6100_probe(struct i2c_client *client,
        info->write_word_data = zl6100_write_word_data;
        info->write_byte = zl6100_write_byte;
 
-       return pmbus_do_probe(client, mid, info);
+       return pmbus_do_probe(client, info);
 }
 
 static struct i2c_driver zl6100_driver = {
        .driver = {
                   .name = "zl6100",
                   },
-       .probe = zl6100_probe,
+       .probe_new = zl6100_probe,
        .remove = pmbus_do_remove,
        .id_table = zl6100_id,
 };