spi: 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/20230525211047.735789-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-sc18is602.c b/drivers/spi/spi-sc18is602.c
index 70012333020b4e3da159e61bf28d5afda509f357..d52ed67243f719015ea12f80f04d4912c6155cc7 100644 (file)
--- a/drivers/spi/spi-sc18is602.c
+++ b/drivers/spi/spi-sc18is602.c
@@ -337,7 +337,7 @@ static struct i2c_driver sc18is602_driver = {
                .name = "sc18is602",
                .of_match_table = of_match_ptr(sc18is602_of_match),
        },
-       .probe_new = sc18is602_probe,
+       .probe = sc18is602_probe,
        .id_table = sc18is602_id,
 };
 

diff --git a/drivers/spi/spi-xcomm.c b/drivers/spi/spi-xcomm.c
index 5d23411f2a3e9c021fc011f40ffd1b98659f7ff7..ae6218bcd02a072235e72d443769b8665debbedf 100644 (file)
--- a/drivers/spi/spi-xcomm.c
+++ b/drivers/spi/spi-xcomm.c
@@ -241,7 +241,7 @@ static struct i2c_driver spi_xcomm_driver = {
                .name   = "spi-xcomm",
        },
        .id_table       = spi_xcomm_ids,
-       .probe_new      = spi_xcomm_probe,
+       .probe          = spi_xcomm_probe,
 };
 module_i2c_driver(spi_xcomm_driver);