Merge tag 'pci-v6.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[linux-block.git] / drivers / hwmon / sht4x.c

diff --git a/drivers/hwmon/sht4x.c b/drivers/hwmon/sht4x.c
index 13ac2d8f22c79b77817e1faa2a3f6c1090977caf..13e042927bf89ee7589664d7f41d716ce14dbbb4 100644 (file)
--- a/drivers/hwmon/sht4x.c
+++ b/drivers/hwmon/sht4x.c
@@ -232,8 +232,7 @@ static const struct hwmon_chip_info sht4x_chip_info = {
        .info = sht4x_info,
 };
 
-static int sht4x_probe(struct i2c_client *client,
-                      const struct i2c_device_id *sht4x_id)
+static int sht4x_probe(struct i2c_client *client)
 {
        struct device *device = &client->dev;
        struct device *hwmon_dev;
@@ -292,7 +291,7 @@ static struct i2c_driver sht4x_driver = {
                .name = "sht4x",
                .of_match_table = sht4x_of_match,
        },
-       .probe          = sht4x_probe,
+       .probe_new      = sht4x_probe,
        .id_table       = sht4x_id,
 };