gpio: Switch i2c drivers back to use .probe()

After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") convert
back to (the new) .probe() to be able to eventually drop .probe_new() from
struct i2c_driver.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/drivers/gpio/gpio-adnp.c b/drivers/gpio/gpio-adnp.c
index 9b01c391efce4657553df0e72da869d0f31ebe94..6dafab0cf964ed6250d4d956b150daec20ff7d16 100644 (file)
--- a/drivers/gpio/gpio-adnp.c
+++ b/drivers/gpio/gpio-adnp.c
@@ -535,7 +535,7 @@ static struct i2c_driver adnp_i2c_driver = {
                .name = "gpio-adnp",
                .of_match_table = adnp_of_match,
        },
-       .probe_new = adnp_i2c_probe,
+       .probe = adnp_i2c_probe,
        .id_table = adnp_i2c_id,
 };
 module_i2c_driver(adnp_i2c_driver);

diff --git a/drivers/gpio/gpio-fxl6408.c b/drivers/gpio/gpio-fxl6408.c
index 208fa851e82a17567ffcd7a3f24d7235a6922cdb..c14b5cc5e5192dd6122777ab32c89869b47e47c5 100644 (file)
--- a/drivers/gpio/gpio-fxl6408.c
+++ b/drivers/gpio/gpio-fxl6408.c
@@ -148,7 +148,7 @@ static struct i2c_driver fxl6408_driver = {
                .name   = "fxl6408",
                .of_match_table = fxl6408_dt_ids,
        },
-       .probe_new      = fxl6408_probe,
+       .probe          = fxl6408_probe,
        .id_table       = fxl6408_id,
 };
 module_i2c_driver(fxl6408_driver);

diff --git a/drivers/gpio/gpio-gw-pld.c b/drivers/gpio/gpio-gw-pld.c
index 5057fa9ad6108a26f093f24eafbc51e91fd4b5b9..899335da93c78bcb7a04770db97141091a67cb2c 100644 (file)
--- a/drivers/gpio/gpio-gw-pld.c
+++ b/drivers/gpio/gpio-gw-pld.c
@@ -125,7 +125,7 @@ static struct i2c_driver gw_pld_driver = {
                .name = "gw_pld",
                .of_match_table = gw_pld_dt_ids,
        },
-       .probe_new = gw_pld_probe,
+       .probe = gw_pld_probe,
        .id_table = gw_pld_id,
 };
 module_i2c_driver(gw_pld_driver);

diff --git a/drivers/gpio/gpio-max7300.c b/drivers/gpio/gpio-max7300.c
index cf482f4f0098297a3ab59348082ee051634fdd37..31c2b95321cc20e9c1589ae08f3e27c16f8897f1 100644 (file)
--- a/drivers/gpio/gpio-max7300.c
+++ b/drivers/gpio/gpio-max7300.c
@@ -62,7 +62,7 @@ static struct i2c_driver max7300_driver = {
        .driver = {
                .name = "max7300",
        },
-       .probe_new = max7300_probe,
+       .probe = max7300_probe,
        .remove = max7300_remove,
        .id_table = max7300_id,
 };

diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c
index 7f2fde191755aade8a7bdfbb15610bd15c2760bc..fca9ca68e3870f292a49b0fc72022b18d2f67cd5 100644 (file)
--- a/drivers/gpio/gpio-max732x.c
+++ b/drivers/gpio/gpio-max732x.c
@@ -711,7 +711,7 @@ static struct i2c_driver max732x_driver = {
                .name           = "max732x",
                .of_match_table = of_match_ptr(max732x_of_table),
        },
-       .probe_new      = max732x_probe,
+       .probe          = max732x_probe,
        .id_table       = max732x_id,
 };
 

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 1286b22ef23af608b42a9a8b6b6b539875c90ca4..a806a3c1b80187453a689cf591561438df94b3ac 100644 (file)
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -1375,7 +1375,7 @@ static struct i2c_driver pca953x_driver = {
                .of_match_table = pca953x_dt_ids,
                .acpi_match_table = pca953x_acpi_ids,
        },
-       .probe_new      = pca953x_probe,
+       .probe          = pca953x_probe,
        .remove         = pca953x_remove,
        .id_table       = pca953x_id,
 };

diff --git a/drivers/gpio/gpio-pca9570.c b/drivers/gpio/gpio-pca9570.c
index 6a5a8e593ed555a317e405854b0ae40e2d0ab57f..d8db80ef1293ad05b86ec20d92657a70be1fdbdf 100644 (file)
--- a/drivers/gpio/gpio-pca9570.c
+++ b/drivers/gpio/gpio-pca9570.c
@@ -175,7 +175,7 @@ static struct i2c_driver pca9570_driver = {
                .name = "pca9570",
                .of_match_table = pca9570_of_match_table,
        },
-       .probe_new = pca9570_probe,
+       .probe = pca9570_probe,
        .id_table = pca9570_id_table,
 };
 module_i2c_driver(pca9570_driver);

diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
index 3de1d3ad7472cbd5d3febd4aaf8f706f24d63fdd..c4c7855484080849915d4ce17dc7271374561609 100644 (file)
--- a/drivers/gpio/gpio-pcf857x.c
+++ b/drivers/gpio/gpio-pcf857x.c
@@ -419,7 +419,7 @@ static struct i2c_driver pcf857x_driver = {
                .name   = "pcf857x",
                .of_match_table = pcf857x_of_table,
        },
-       .probe_new = pcf857x_probe,
+       .probe = pcf857x_probe,
        .shutdown = pcf857x_shutdown,
        .id_table = pcf857x_id,
 };

diff --git a/drivers/gpio/gpio-tpic2810.c b/drivers/gpio/gpio-tpic2810.c
index 642ed82b9de2cefcdbf89d562952c40bec8d9c68..effb7b8ff81fd51664b7f51a124aaafbf3504feb 100644 (file)
--- a/drivers/gpio/gpio-tpic2810.c
+++ b/drivers/gpio/gpio-tpic2810.c
@@ -127,7 +127,7 @@ static struct i2c_driver tpic2810_driver = {
                .name = "tpic2810",
                .of_match_table = tpic2810_of_match_table,
        },
-       .probe_new = tpic2810_probe,
+       .probe = tpic2810_probe,
        .id_table = tpic2810_id_table,
 };
 module_i2c_driver(tpic2810_driver);

diff --git a/drivers/gpio/gpio-ts4900.c b/drivers/gpio/gpio-ts4900.c
index 43e8b66e04f781deb7f466e299ead30e6f449a99..eba96319dac2ff2a11fbae644969aeacf414ea30 100644 (file)
--- a/drivers/gpio/gpio-ts4900.c
+++ b/drivers/gpio/gpio-ts4900.c
@@ -185,7 +185,7 @@ static struct i2c_driver ts4900_gpio_driver = {
                .name = "ts4900-gpio",
                .of_match_table = ts4900_gpio_of_match_table,
        },
-       .probe_new = ts4900_gpio_probe,
+       .probe = ts4900_gpio_probe,
        .id_table = ts4900_gpio_id_table,
 };
 module_i2c_driver(ts4900_gpio_driver);