Merge tag 'driver-core-5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/drivers/hwmon/w83795.c b/drivers/hwmon/w83795.c
index 6d52b53..621b05a 100644 (file)
--- a/drivers/hwmon/w83795.c
+++ b/drivers/hwmon/w83795.c
@@ -2134,8 +2134,9 @@ static void w83795_apply_temp_config(struct w83795_data *data, u8 config,
        }
 }
 
-static int w83795_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static const struct i2c_device_id w83795_id[];
+
+static int w83795_probe(struct i2c_client *client)
 {
        int i;
        u8 tmp;
@@ -2148,7 +2149,7 @@ static int w83795_probe(struct i2c_client *client,
                return -ENOMEM;
 
        i2c_set_clientdata(client, data);
-       data->chip_type = id->driver_data;
+       data->chip_type = i2c_match_id(w83795_id, client)->driver_data;
        data->bank = i2c_smbus_read_byte_data(client, W83795_REG_BANKSEL);
        mutex_init(&data->update_lock);
 
@@ -2256,7 +2257,7 @@ static struct i2c_driver w83795_driver = {
        .driver = {
                   .name = "w83795",
        },
-       .probe          = w83795_probe,
+       .probe_new      = w83795_probe,
        .remove         = w83795_remove,
        .id_table       = w83795_id,