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 / atxp1.c

diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c
index 79b8df2..1e08a54 100644 (file)
--- a/drivers/hwmon/atxp1.c
+++ b/drivers/hwmon/atxp1.c
@@ -244,8 +244,7 @@ static struct attribute *atxp1_attrs[] = {
 };
 ATTRIBUTE_GROUPS(atxp1);
 
-static int atxp1_probe(struct i2c_client *client,
-                      const struct i2c_device_id *id)
+static int atxp1_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct atxp1_data *data;
@@ -288,7 +287,7 @@ static struct i2c_driver atxp1_driver = {
        .driver = {
                .name   = "atxp1",
        },
-       .probe          = atxp1_probe,
+       .probe_new      = atxp1_probe,
        .id_table       = atxp1_id,
 };