Merge tag 'kgdb-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt...
[linux-2.6-microblaze.git] / drivers / hwmon / ltc4151.c
index 67a529b..321f54e 100644 (file)
@@ -154,8 +154,7 @@ static struct attribute *ltc4151_attrs[] = {
 };
 ATTRIBUTE_GROUPS(ltc4151);
 
-static int ltc4151_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int ltc4151_probe(struct i2c_client *client)
 {
        struct i2c_adapter *adapter = client->adapter;
        struct device *dev = &client->dev;
@@ -206,7 +205,7 @@ static struct i2c_driver ltc4151_driver = {
                .name   = "ltc4151",
                .of_match_table = of_match_ptr(ltc4151_match),
        },
-       .probe          = ltc4151_probe,
+       .probe_new      = ltc4151_probe,
        .id_table       = ltc4151_id,
 };