macintosh: 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: Jean Delvare <jdelvare@suse.de>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230523195053.464138-1-u.kleine-koenig@pengutronix.de

diff --git a/drivers/macintosh/ams/ams-i2c.c b/drivers/macintosh/ams/ams-i2c.c
index a4a1035eb412332e55b2caed28dbaca08f03d947..f9bfe84b1c73566cd0d50564e3ce73aaa187d309 100644 (file)
--- a/drivers/macintosh/ams/ams-i2c.c
+++ b/drivers/macintosh/ams/ams-i2c.c
@@ -69,7 +69,7 @@ static struct i2c_driver ams_i2c_driver = {
        .driver = {
                .name   = "ams",
        },
-       .probe_new      = ams_i2c_probe,
+       .probe          = ams_i2c_probe,
        .remove         = ams_i2c_remove,
        .id_table       = ams_id,
 };

diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index 384b87d661e1c507fe1a8bd1144f54aaadbcc105..53ea56b286f91166b4fb368bcac32075a4a050aa 100644 (file)
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -598,7 +598,7 @@ static struct i2c_driver thermostat_driver = {
        .driver = {
                .name   = "therm_adt746x",
        },
-       .probe_new = probe_thermostat,
+       .probe = probe_thermostat,
        .remove = remove_thermostat,
        .id_table = therm_adt746x_id,
 };

diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 22b15efcc0258af874dd267d68556e4fcca812a7..18a98245432103cfaf93a6ba5f897ac43e89f437 100644 (file)
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -442,7 +442,7 @@ static struct i2c_driver g4fan_driver = {
        .driver = {
                .name   = "therm_windtunnel",
        },
-       .probe_new      = do_probe,
+       .probe          = do_probe,
        .remove         = do_remove,
        .id_table       = therm_windtunnel_id,
 };

diff --git a/drivers/macintosh/windfarm_ad7417_sensor.c b/drivers/macintosh/windfarm_ad7417_sensor.c
index 33b4723d235e45da2076d8b3f847e71f2d335c5f..49ce37fde9300a15c064c5074c5687ca5c741474 100644 (file)
--- a/drivers/macintosh/windfarm_ad7417_sensor.c
+++ b/drivers/macintosh/windfarm_ad7417_sensor.c
@@ -320,7 +320,7 @@ static struct i2c_driver wf_ad7417_driver = {
                .name   = "wf_ad7417",
                .of_match_table = wf_ad7417_of_id,
        },
-       .probe_new      = wf_ad7417_probe,
+       .probe          = wf_ad7417_probe,
        .remove         = wf_ad7417_remove,
        .id_table       = wf_ad7417_id,
 };

diff --git a/drivers/macintosh/windfarm_fcu_controls.c b/drivers/macintosh/windfarm_fcu_controls.c
index e027d889d7e80c070d091782a5ad1d5eeba822f2..603ef6c600ba8848e5358f5c601be03bda0c1732 100644 (file)
--- a/drivers/macintosh/windfarm_fcu_controls.c
+++ b/drivers/macintosh/windfarm_fcu_controls.c
@@ -589,7 +589,7 @@ static struct i2c_driver wf_fcu_driver = {
                .name   = "wf_fcu",
                .of_match_table = wf_fcu_of_id,
        },
-       .probe_new      = wf_fcu_probe,
+       .probe          = wf_fcu_probe,
        .remove         = wf_fcu_remove,
        .id_table       = wf_fcu_id,
 };

diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index 9c6febce2376ba84eee18d679d7d7b7d0bad7f3a..48dbdb2bda150a36dc1c0d0b0a9d1adc3e02e6d1 100644 (file)
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -177,7 +177,7 @@ static struct i2c_driver wf_lm75_driver = {
                .name   = "wf_lm75",
                .of_match_table = wf_lm75_of_id,
        },
-       .probe_new      = wf_lm75_probe,
+       .probe          = wf_lm75_probe,
        .remove         = wf_lm75_remove,
        .id_table       = wf_lm75_id,
 };

diff --git a/drivers/macintosh/windfarm_lm87_sensor.c b/drivers/macintosh/windfarm_lm87_sensor.c
index f37a32c2070ca010d376a0bf0c1dab5ca3b4bb3e..975361c23a93a8fb4cf257bbe4d09d9f1c2f1c64 100644 (file)
--- a/drivers/macintosh/windfarm_lm87_sensor.c
+++ b/drivers/macintosh/windfarm_lm87_sensor.c
@@ -172,7 +172,7 @@ static struct i2c_driver wf_lm87_driver = {
                .name   = "wf_lm87",
                .of_match_table = wf_lm87_of_id,
        },
-       .probe_new      = wf_lm87_probe,
+       .probe          = wf_lm87_probe,
        .remove         = wf_lm87_remove,
        .id_table       = wf_lm87_id,
 };

diff --git a/drivers/macintosh/windfarm_max6690_sensor.c b/drivers/macintosh/windfarm_max6690_sensor.c
index 6c5ab657b6b39c7cbc061ff90295956ce7cb2a15..02856d1f031376f0e7fd1f90c8095fee5030f58b 100644 (file)
--- a/drivers/macintosh/windfarm_max6690_sensor.c
+++ b/drivers/macintosh/windfarm_max6690_sensor.c
@@ -128,7 +128,7 @@ static struct i2c_driver wf_max6690_driver = {
                .name           = "wf_max6690",
                .of_match_table = wf_max6690_of_id,
        },
-       .probe_new      = wf_max6690_probe,
+       .probe          = wf_max6690_probe,
        .remove         = wf_max6690_remove,
        .id_table       = wf_max6690_id,
 };

diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index 089f2743a070d163383a577c2e0878ab1c19833e..50baa062c9dfb8021a3cfe9bc0200193cb791201 100644 (file)
--- a/drivers/macintosh/windfarm_smu_sat.c
+++ b/drivers/macintosh/windfarm_smu_sat.c
@@ -349,7 +349,7 @@ static struct i2c_driver wf_sat_driver = {
                .name           = "wf_smu_sat",
                .of_match_table = wf_sat_of_id,
        },
-       .probe_new      = wf_sat_probe,
+       .probe          = wf_sat_probe,
        .remove         = wf_sat_remove,
        .id_table       = wf_sat_id,
 };