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

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

diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 7bdc664..ebbfd5f 100644 (file)
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -1779,8 +1779,7 @@ static const struct hwmon_ops lm90_ops = {
        .write = lm90_write,
 };
 
-static int lm90_probe(struct i2c_client *client,
-                     const struct i2c_device_id *id)
+static int lm90_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct i2c_adapter *adapter = client->adapter;
@@ -1816,7 +1815,7 @@ static int lm90_probe(struct i2c_client *client,
        if (client->dev.of_node)
                data->kind = (enum chips)of_device_get_match_data(&client->dev);
        else
-               data->kind = id->driver_data;
+               data->kind = i2c_match_id(lm90_id, client)->driver_data;
        if (data->kind == adm1032) {
                if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE))
                        client->flags &= ~I2C_CLIENT_PEC;
@@ -1952,7 +1951,7 @@ static struct i2c_driver lm90_driver = {
                .name   = "lm90",
                .of_match_table = of_match_ptr(lm90_of_match),
        },
-       .probe          = lm90_probe,
+       .probe_new      = lm90_probe,
        .alert          = lm90_alert,
        .id_table       = lm90_id,
        .detect         = lm90_detect,