Merge tag 'kgdb-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt...

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

diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index cff0aa5..c7bf5de 100644 (file)
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -1544,7 +1544,9 @@ static int lm85_detect(struct i2c_client *client, struct i2c_board_info *info)
        return 0;
 }
 
-static int lm85_probe(struct i2c_client *client, const struct i2c_device_id *id)
+static const struct i2c_device_id lm85_id[];
+
+static int lm85_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct device *hwmon_dev;
@@ -1559,7 +1561,7 @@ static int lm85_probe(struct i2c_client *client, const struct i2c_device_id *id)
        if (client->dev.of_node)
                data->type = (enum chips)of_device_get_match_data(&client->dev);
        else
-               data->type = id->driver_data;
+               data->type = i2c_match_id(lm85_id, client)->driver_data;
        mutex_init(&data->update_lock);
 
        /* Fill in the chip specific driver values */
@@ -1696,7 +1698,7 @@ static struct i2c_driver lm85_driver = {
                .name   = "lm85",
                .of_match_table = of_match_ptr(lm85_of_match),
        },
-       .probe          = lm85_probe,
+       .probe_new      = lm85_probe,
        .id_table       = lm85_id,
        .detect         = lm85_detect,
        .address_list   = normal_i2c,