[PATCH 0/3] platform: Switch back to use struct i2c_driver's .probe()

[PATCH 0/3] platform: Switch back to use struct i2c_driver's .probe()

[Uwe Kleine-König]

Hello,

these three patches convert three i2c drivers back to use .probe() after
its prototype was changed.

I was unsure if I should put the surface change together with the two
other x86 changes but as surfaces are x86, too, I thought this might be
right. If not: The patches are orthogonal to each other, so they can be
applied to different trees without interdependencies.

Best regards
Uwe

Uwe Kleine-König (3):
  surface: surface3_power: Switch back to use struct i2c_driver's
    .probe()
  platform/x86: asus-tf103c-dock: Switch back to use struct i2c_driver's
    .probe()
  platform/x86: int3472: Switch back to use struct i2c_driver's .probe()

 drivers/platform/surface/surface3_power.c     | 2 +-
 drivers/platform/x86/asus-tf103c-dock.c       | 2 +-
 drivers/platform/x86/intel/int3472/tps68470.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

base-commit: ac9a78681b921877518763ba0e89202254349d1b
-- 
2.39.2

[PATCH 1/3] surface: surface3_power: Switch back to use struct i2c_driver's .probe()

[Uwe Kleine-König]

After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
commit 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>
---
 drivers/platform/surface/surface3_power.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/surface/surface3_power.c b/drivers/platform/surface/surface3_power.c
index 73961a24c849..4c0f92562a79 100644
--- a/drivers/platform/surface/surface3_power.c
+++ b/drivers/platform/surface/surface3_power.c
@@ -573,7 +573,7 @@ static const struct acpi_device_id mshw0011_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, mshw0011_acpi_match);
 
 static struct i2c_driver mshw0011_driver = {
-	.probe_new = mshw0011_probe,
+	.probe = mshw0011_probe,
 	.remove = mshw0011_remove,
 	.driver = {
 		.name = "mshw0011",
-- 
2.39.2

[PATCH 2/3] platform/x86: asus-tf103c-dock: Switch back to use struct i2c_driver's .probe()

[Uwe Kleine-König]

After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
commit 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>
---
 drivers/platform/x86/asus-tf103c-dock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/x86/asus-tf103c-dock.c b/drivers/platform/x86/asus-tf103c-dock.c
index aeb1138464df..8f0f87637c5f 100644
--- a/drivers/platform/x86/asus-tf103c-dock.c
+++ b/drivers/platform/x86/asus-tf103c-dock.c
@@ -933,7 +933,7 @@ static struct i2c_driver tf103c_dock_driver = {
 		.pm = &tf103c_dock_pm_ops,
 		.acpi_match_table = tf103c_dock_acpi_match,
 	},
-	.probe_new = tf103c_dock_probe,
+	.probe = tf103c_dock_probe,
 	.remove	= tf103c_dock_remove,
 };
 module_i2c_driver(tf103c_dock_driver);
-- 
2.39.2

[PATCH 3/3] platform/x86: int3472: Switch back to use struct i2c_driver's .probe()

[Uwe Kleine-König]

After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
commit 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>
---
 drivers/platform/x86/intel/int3472/tps68470.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c
index 5b8d1a9620a5..1e107fd49f82 100644
--- a/drivers/platform/x86/intel/int3472/tps68470.c
+++ b/drivers/platform/x86/intel/int3472/tps68470.c
@@ -250,7 +250,7 @@ static struct i2c_driver int3472_tps68470 = {
 		.name = "int3472-tps68470",
 		.acpi_match_table = int3472_device_id,
 	},
-	.probe_new = skl_int3472_tps68470_probe,
+	.probe = skl_int3472_tps68470_probe,
 	.remove = skl_int3472_tps68470_remove,
 };
 module_i2c_driver(int3472_tps68470);
-- 
2.39.2

Re: [PATCH 0/3] platform: Switch back to use struct i2c_driver's .probe()

[Maximilian Luz]

On 6/12/23 09:38, Uwe Kleine-König wrote:
> Hello,
> 
> these three patches convert three i2c drivers back to use .probe() after
> its prototype was changed.
> 
> I was unsure if I should put the surface change together with the two
> other x86 changes but as surfaces are x86, too, I thought this might be
> right. If not: The patches are orthogonal to each other, so they can be
> applied to different trees without interdependencies.

While Hans is the authority on that, I believe that's fine. Both go
through Hans' pdx86 tree.

Regards,
Max

Re: [PATCH 1/3] surface: surface3_power: Switch back to use struct i2c_driver's .probe()

[Maximilian Luz]

On 6/12/23 09:39, 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
> commit 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>

Thanks!

Acked-by: Maximilian Luz <luzmaximilian@gmail.com>

> ---
>   drivers/platform/surface/surface3_power.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/platform/surface/surface3_power.c b/drivers/platform/surface/surface3_power.c
> index 73961a24c849..4c0f92562a79 100644
> --- a/drivers/platform/surface/surface3_power.c
> +++ b/drivers/platform/surface/surface3_power.c
> @@ -573,7 +573,7 @@ static const struct acpi_device_id mshw0011_acpi_match[] = {
>   MODULE_DEVICE_TABLE(acpi, mshw0011_acpi_match);
>   
>   static struct i2c_driver mshw0011_driver = {
> -	.probe_new = mshw0011_probe,
> +	.probe = mshw0011_probe,
>   	.remove = mshw0011_remove,
>   	.driver = {
>   		.name = "mshw0011",

Re: [PATCH 0/3] platform: Switch back to use struct i2c_driver's .probe()

[Hans de Goede]

Hi,

On 6/12/23 12:51, Maximilian Luz wrote:
> On 6/12/23 09:38, Uwe Kleine-König wrote:
>> Hello,
>>
>> these three patches convert three i2c drivers back to use .probe() after
>> its prototype was changed.
>>
>> I was unsure if I should put the surface change together with the two
>> other x86 changes but as surfaces are x86, too, I thought this might be
>> right. If not: The patches are orthogonal to each other, so they can be
>> applied to different trees without interdependencies.
> 
> While Hans is the authority on that, I believe that's fine. Both go
> through Hans' pdx86 tree.

Yes, all 3 look good to me:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

and I'll merge this into my pdx86/review-hans branch soon
(and after that they'll go to -next once the builders have
had a chance to run their test builds on my review-hans branch).

Regards,

Hans

Re: [PATCH 0/3] platform: Switch back to use struct i2c_driver's .probe()

[Hans de Goede]

Hi,

On 6/12/23 09:38, Uwe Kleine-König wrote:
> Hello,
> 
> these three patches convert three i2c drivers back to use .probe() after
> its prototype was changed.
> 
> I was unsure if I should put the surface change together with the two
> other x86 changes but as surfaces are x86, too, I thought this might be
> right. If not: The patches are orthogonal to each other, so they can be
> applied to different trees without interdependencies.
> 
> Best regards
> Uwe

Thank you for your patch-series, I've applied the series to my
review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans

Note it will show up in my review-hans branch once I've pushed my
local branch there, which might take a while.

Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.

Regards,

Hans



> Uwe Kleine-König (3):
>   surface: surface3_power: Switch back to use struct i2c_driver's
>     .probe()
>   platform/x86: asus-tf103c-dock: Switch back to use struct i2c_driver's
>     .probe()
>   platform/x86: int3472: Switch back to use struct i2c_driver's .probe()
> 
>  drivers/platform/surface/surface3_power.c     | 2 +-
>  drivers/platform/x86/asus-tf103c-dock.c       | 2 +-
>  drivers/platform/x86/intel/int3472/tps68470.c | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> base-commit: ac9a78681b921877518763ba0e89202254349d1b