[PATCH] 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
---
Hello,
this patch was generated using coccinelle, but I aligned the result to
the per-file indention.
I chose to convert all drivers below drivers/macintosh in a single
patch, but if you prefer I can split by driver.
v6.4-rc1 was taken as a base, as there are no commits in next touching
drivers/macintosh I don't expect problems when applying this patch. If
conflicts arise until this is applied, feel free to just drop the files
with conflicts from this patch. I'll care about the fallout later then.
Also note there is no coordination necessary with the i2c tree. Dropping
.probe_new() will happen only when all (or most) drivers are converted,
which will happen after v6.5-rc1 for sure.
Best regards
Uwe
drivers/macintosh/ams/ams-i2c.c | 2 +-
drivers/macintosh/therm_adt746x.c | 2 +-
drivers/macintosh/therm_windtunnel.c| 2 +-
drivers/macintosh/windfarm_ad7417_sensor.c | 2 +-
drivers/macintosh/windfarm_fcu_controls.c | 2 +-
drivers/macintosh/windfarm_lm75_sensor.c| 2 +-
drivers/macintosh/windfarm_lm87_sensor.c| 2 +-
drivers/macintosh/windfarm_max6690_sensor.c | 2 +-
drivers/macintosh/windfarm_smu_sat.c| 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/macintosh/ams/ams-i2c.c b/drivers/macintosh/ams/ams-i2c.c
index a4a1035eb412..f9bfe84b1c73 100644
--- 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 384b87d661e1..53ea56b286f9 100644
--- 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 22b15efcc025..18a982454321 100644
--- 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 33b4723d235e..49ce37fde930 100644
--- 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 e027d889d7e8..603ef6c600ba 100644
--- 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 9c6febce2376..48dbdb2bda15 100644
--- 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 f37a32c2070c..975361c23a93 100644
--- a/drivers/macintosh/windfarm_lm87_sensor.c
+++ b/drivers/macintosh/windfarm_lm87_sensor.c
Re: [PATCH] macintosh: Switch i2c drivers back to use .probe()
On Tue, May 23, 2023 at 09:50:53PM +0200, Uwe Kleine-König wrote:
> 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
Reviewed-by: Dmitry Torokhov
Thanks.
--
Dmitry
Re: [PATCH] macintosh: Switch i2c drivers back to use .probe()
On Tue, 23 May 2023 21:50:53 +0200, Uwe Kleine-König wrote:
> 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
> ---
> Hello,
>
> this patch was generated using coccinelle, but I aligned the result to
> the per-file indention.
>
> I chose to convert all drivers below drivers/macintosh in a single
> patch, but if you prefer I can split by driver.
>
> v6.4-rc1 was taken as a base, as there are no commits in next touching
> drivers/macintosh I don't expect problems when applying this patch. If
> conflicts arise until this is applied, feel free to just drop the files
> with conflicts from this patch. I'll care about the fallout later then.
>
> Also note there is no coordination necessary with the i2c tree. Dropping
> .probe_new() will happen only when all (or most) drivers are converted,
> which will happen after v6.5-rc1 for sure.
>
> Best regards
> Uwe
>
> drivers/macintosh/ams/ams-i2c.c | 2 +-
> drivers/macintosh/therm_adt746x.c | 2 +-
> drivers/macintosh/therm_windtunnel.c| 2 +-
> drivers/macintosh/windfarm_ad7417_sensor.c | 2 +-
> drivers/macintosh/windfarm_fcu_controls.c | 2 +-
> drivers/macintosh/windfarm_lm75_sensor.c| 2 +-
> drivers/macintosh/windfarm_lm87_sensor.c| 2 +-
> drivers/macintosh/windfarm_max6690_sensor.c | 2 +-
> drivers/macintosh/windfarm_smu_sat.c| 2 +-
> 9 files changed, 9 insertions(+), 9 deletions(-)
> (...)
Reviewed-by: Jean Delvare
--
Jean Delvare
SUSE L3 Support
Re: [PATCH] macintosh: Switch i2c drivers back to use .probe()
Hello,
On Tue, May 23, 2023 at 09:50:53PM +0200, Uwe Kleine-König wrote:
> 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
> ---
> Hello,
>
> this patch was generated using coccinelle, but I aligned the result to
> the per-file indention.
>
> I chose to convert all drivers below drivers/macintosh in a single
> patch, but if you prefer I can split by driver.
>
> v6.4-rc1 was taken as a base, as there are no commits in next touching
> drivers/macintosh I don't expect problems when applying this patch. If
> conflicts arise until this is applied, feel free to just drop the files
> with conflicts from this patch. I'll care about the fallout later then.
>
> Also note there is no coordination necessary with the i2c tree. Dropping
> .probe_new() will happen only when all (or most) drivers are converted,
> which will happen after v6.5-rc1 for sure.
Can someone still pick up this patch for v6.5-rc1? I intend to send a
pull request to Wolfram's i2c-tree that drops .probe_new() from struct
i2c_driver on top of v6.5-rc1 early after the merge window closes. So
getting this in before would be great. Otherwise I'm happily adding
received acks to this patch for my PR :-)
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König|
Industrial Linux Solutions | https://www.pengutronix.de/ |
signature.asc
Description: PGP signature
Re: [PATCH] macintosh: Switch i2c drivers back to use .probe()
Uwe Kleine-König writes:
> On Tue, May 23, 2023 at 09:50:53PM +0200, Uwe Kleine-König wrote:
>> 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
>> ---
>> Hello,
>>
>> this patch was generated using coccinelle, but I aligned the result to
>> the per-file indention.
>>
>> I chose to convert all drivers below drivers/macintosh in a single
>> patch, but if you prefer I can split by driver.
>>
>> v6.4-rc1 was taken as a base, as there are no commits in next touching
>> drivers/macintosh I don't expect problems when applying this patch. If
>> conflicts arise until this is applied, feel free to just drop the files
>> with conflicts from this patch. I'll care about the fallout later then.
>>
>> Also note there is no coordination necessary with the i2c tree. Dropping
>> .probe_new() will happen only when all (or most) drivers are converted,
>> which will happen after v6.5-rc1 for sure.
>
> Can someone still pick up this patch for v6.5-rc1?
Yes, I will.
cheers
Re: [PATCH] macintosh: Switch i2c drivers back to use .probe()
On Tue, 23 May 2023 21:50:53 +0200, Uwe Kleine-König wrote:
> 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.
>
>
> [...]
Applied to powerpc/next.
[1/1] macintosh: Switch i2c drivers back to use .probe()
https://git.kernel.org/powerpc/c/922db7c571f55b1eab2d2c5da14d150aff1d0252
cheers
