Merge tag 'arc-5.10-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupt...

[linux-2.6-microblaze.git] / drivers / hwmon / lm78.c

diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 2119461..1aa35ca 100644 (file)
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -627,8 +627,9 @@ static int lm78_i2c_detect(struct i2c_client *client,
        return -ENODEV;
 }
 
-static int lm78_i2c_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static const struct i2c_device_id lm78_i2c_id[];
+
+static int lm78_i2c_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct device *hwmon_dev;
@@ -639,7 +640,7 @@ static int lm78_i2c_probe(struct i2c_client *client,
                return -ENOMEM;
 
        data->client = client;
-       data->type = id->driver_data;
+       data->type = i2c_match_id(lm78_i2c_id, client)->driver_data;
 
        /* Initialize the LM78 chip */
        lm78_init_device(data);
@@ -661,7 +662,7 @@ static struct i2c_driver lm78_driver = {
        .driver = {
                .name   = "lm78",
        },
-       .probe          = lm78_i2c_probe,
+       .probe_new      = lm78_i2c_probe,
        .id_table       = lm78_i2c_id,
        .detect         = lm78_i2c_detect,
        .address_list   = normal_i2c,