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

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

diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index 87c6665..8bd941c 100644 (file)
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -261,8 +261,7 @@ static void max1619_init_client(struct i2c_client *client)
                                          config & 0xBF); /* run */
 }
 
-static int max1619_probe(struct i2c_client *new_client,
-                        const struct i2c_device_id *id)
+static int max1619_probe(struct i2c_client *new_client)
 {
        struct max1619_data *data;
        struct device *hwmon_dev;
@@ -306,7 +305,7 @@ static struct i2c_driver max1619_driver = {
                .name   = "max1619",
                .of_match_table = of_match_ptr(max1619_of_match),
        },
-       .probe          = max1619_probe,
+       .probe_new      = max1619_probe,
        .id_table       = max1619_id,
        .detect         = max1619_detect,
        .address_list   = normal_i2c,