Merge tag 's390-5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

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

diff --git a/drivers/hwmon/tmp108.c b/drivers/hwmon/tmp108.c
index fe587d4..5435664 100644 (file)
--- a/drivers/hwmon/tmp108.c
+++ b/drivers/hwmon/tmp108.c
@@ -323,8 +323,7 @@ static const struct regmap_config tmp108_regmap_config = {
        .use_single_write = true,
 };
 
-static int tmp108_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int tmp108_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct device *hwmon_dev;
@@ -433,7 +432,7 @@ static struct i2c_driver tmp108_driver = {
                .pm     = &tmp108_dev_pm_ops,
                .of_match_table = of_match_ptr(tmp108_of_ids),
        },
-       .probe          = tmp108_probe,
+       .probe_new      = tmp108_probe,
        .id_table       = tmp108_i2c_ids,
 };