Commit 922db7c5 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Michael Ellerman

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

After commit b8a1a4cd ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
03c835f4 ("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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarJean Delvare <jdelvare@suse.de>
Reviewed-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230523195053.464138-1-u.kleine-koenig@pengutronix.de
parent a03b1a0b
...@@ -69,7 +69,7 @@ static struct i2c_driver ams_i2c_driver = { ...@@ -69,7 +69,7 @@ static struct i2c_driver ams_i2c_driver = {
.driver = { .driver = {
.name = "ams", .name = "ams",
}, },
.probe_new = ams_i2c_probe, .probe = ams_i2c_probe,
.remove = ams_i2c_remove, .remove = ams_i2c_remove,
.id_table = ams_id, .id_table = ams_id,
}; };
......
...@@ -598,7 +598,7 @@ static struct i2c_driver thermostat_driver = { ...@@ -598,7 +598,7 @@ static struct i2c_driver thermostat_driver = {
.driver = { .driver = {
.name = "therm_adt746x", .name = "therm_adt746x",
}, },
.probe_new = probe_thermostat, .probe = probe_thermostat,
.remove = remove_thermostat, .remove = remove_thermostat,
.id_table = therm_adt746x_id, .id_table = therm_adt746x_id,
}; };
......
...@@ -442,7 +442,7 @@ static struct i2c_driver g4fan_driver = { ...@@ -442,7 +442,7 @@ static struct i2c_driver g4fan_driver = {
.driver = { .driver = {
.name = "therm_windtunnel", .name = "therm_windtunnel",
}, },
.probe_new = do_probe, .probe = do_probe,
.remove = do_remove, .remove = do_remove,
.id_table = therm_windtunnel_id, .id_table = therm_windtunnel_id,
}; };
......
...@@ -320,7 +320,7 @@ static struct i2c_driver wf_ad7417_driver = { ...@@ -320,7 +320,7 @@ static struct i2c_driver wf_ad7417_driver = {
.name = "wf_ad7417", .name = "wf_ad7417",
.of_match_table = wf_ad7417_of_id, .of_match_table = wf_ad7417_of_id,
}, },
.probe_new = wf_ad7417_probe, .probe = wf_ad7417_probe,
.remove = wf_ad7417_remove, .remove = wf_ad7417_remove,
.id_table = wf_ad7417_id, .id_table = wf_ad7417_id,
}; };
......
...@@ -589,7 +589,7 @@ static struct i2c_driver wf_fcu_driver = { ...@@ -589,7 +589,7 @@ static struct i2c_driver wf_fcu_driver = {
.name = "wf_fcu", .name = "wf_fcu",
.of_match_table = wf_fcu_of_id, .of_match_table = wf_fcu_of_id,
}, },
.probe_new = wf_fcu_probe, .probe = wf_fcu_probe,
.remove = wf_fcu_remove, .remove = wf_fcu_remove,
.id_table = wf_fcu_id, .id_table = wf_fcu_id,
}; };
......
...@@ -177,7 +177,7 @@ static struct i2c_driver wf_lm75_driver = { ...@@ -177,7 +177,7 @@ static struct i2c_driver wf_lm75_driver = {
.name = "wf_lm75", .name = "wf_lm75",
.of_match_table = wf_lm75_of_id, .of_match_table = wf_lm75_of_id,
}, },
.probe_new = wf_lm75_probe, .probe = wf_lm75_probe,
.remove = wf_lm75_remove, .remove = wf_lm75_remove,
.id_table = wf_lm75_id, .id_table = wf_lm75_id,
}; };
......
...@@ -172,7 +172,7 @@ static struct i2c_driver wf_lm87_driver = { ...@@ -172,7 +172,7 @@ static struct i2c_driver wf_lm87_driver = {
.name = "wf_lm87", .name = "wf_lm87",
.of_match_table = wf_lm87_of_id, .of_match_table = wf_lm87_of_id,
}, },
.probe_new = wf_lm87_probe, .probe = wf_lm87_probe,
.remove = wf_lm87_remove, .remove = wf_lm87_remove,
.id_table = wf_lm87_id, .id_table = wf_lm87_id,
}; };
......
...@@ -128,7 +128,7 @@ static struct i2c_driver wf_max6690_driver = { ...@@ -128,7 +128,7 @@ static struct i2c_driver wf_max6690_driver = {
.name = "wf_max6690", .name = "wf_max6690",
.of_match_table = wf_max6690_of_id, .of_match_table = wf_max6690_of_id,
}, },
.probe_new = wf_max6690_probe, .probe = wf_max6690_probe,
.remove = wf_max6690_remove, .remove = wf_max6690_remove,
.id_table = wf_max6690_id, .id_table = wf_max6690_id,
}; };
......
...@@ -349,7 +349,7 @@ static struct i2c_driver wf_sat_driver = { ...@@ -349,7 +349,7 @@ static struct i2c_driver wf_sat_driver = {
.name = "wf_smu_sat", .name = "wf_smu_sat",
.of_match_table = wf_sat_of_id, .of_match_table = wf_sat_of_id,
}, },
.probe_new = wf_sat_probe, .probe = wf_sat_probe,
.remove = wf_sat_remove, .remove = wf_sat_remove,
.id_table = wf_sat_id, .id_table = wf_sat_id,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment