pinctrl: 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>
Link: https://lore.kernel.org/r/20230525204258.711186-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/pinctrl-cy8c95x0.c b/drivers/pinctrl/pinctrl-cy8c95x0.c
index 564fbaa..2ecc966 100644 (file)
--- a/drivers/pinctrl/pinctrl-cy8c95x0.c
+++ b/drivers/pinctrl/pinctrl-cy8c95x0.c
@@ -1442,7 +1442,7 @@ static struct i2c_driver cy8c95x0_driver = {
                .of_match_table = cy8c95x0_dt_ids,
                .acpi_match_table = cy8c95x0_acpi_ids,
        },
-       .probe_new      = cy8c95x0_probe,
+       .probe          = cy8c95x0_probe,
        .remove         = cy8c95x0_remove,
        .id_table       = cy8c95x0_id,
        .detect         = cy8c95x0_detect,

diff --git a/drivers/pinctrl/pinctrl-mcp23s08_i2c.c b/drivers/pinctrl/pinctrl-mcp23s08_i2c.c
index b635c57..3dd1bd8 100644 (file)
--- a/drivers/pinctrl/pinctrl-mcp23s08_i2c.c
+++ b/drivers/pinctrl/pinctrl-mcp23s08_i2c.c
@@ -101,7 +101,7 @@ static struct i2c_driver mcp230xx_driver = {
                .name   = "mcp230xx",
                .of_match_table = mcp23s08_i2c_of_match,
        },
-       .probe_new      = mcp230xx_probe,
+       .probe          = mcp230xx_probe,
        .id_table       = mcp230xx_id,
 };
 

diff --git a/drivers/pinctrl/pinctrl-sx150x.c b/drivers/pinctrl/pinctrl-sx150x.c
index 7632ffc..35faea8 100644 (file)
--- a/drivers/pinctrl/pinctrl-sx150x.c
+++ b/drivers/pinctrl/pinctrl-sx150x.c
@@ -1262,7 +1262,7 @@ static struct i2c_driver sx150x_driver = {
                .name = "sx150x-pinctrl",
                .of_match_table = sx150x_of_match,
        },
-       .probe_new = sx150x_probe,
+       .probe = sx150x_probe,
        .id_table = sx150x_id,
 };