Merge tag 'printk-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek...

[linux-2.6-microblaze.git] / drivers / mux / adg792a.c

diff --git a/drivers/mux/adg792a.c b/drivers/mux/adg792a.c
index 6a8725c..e8fc2fc 100644 (file)
--- a/drivers/mux/adg792a.c
+++ b/drivers/mux/adg792a.c
@@ -58,8 +58,7 @@ static const struct mux_control_ops adg792a_ops = {
        .set = adg792a_set,
 };
 
-static int adg792a_probe(struct i2c_client *i2c,
-                        const struct i2c_device_id *id)
+static int adg792a_probe(struct i2c_client *i2c)
 {
        struct device *dev = &i2c->dev;
        struct mux_chip *mux_chip;
@@ -144,7 +143,7 @@ static struct i2c_driver adg792a_driver = {
                .name           = "adg792a",
                .of_match_table = of_match_ptr(adg792a_of_match),
        },
-       .probe          = adg792a_probe,
+       .probe_new      = adg792a_probe,
        .id_table       = adg792a_id,
 };
 module_i2c_driver(adg792a_driver);