[PATCH v2 0/5] staging: Switch i2c drivers back to use .probe()

[PATCH v2 0/5] staging: Switch i2c drivers back to use .probe()

[Uwe Kleine-König]

Hello,

changes since (implicit) v1, sent with Message-Id:
<20230523200036.465180-1-u.kleine-koenig@pengutronix.de>:

 - Split by driver/driver area
 - Rebase to next/master in the hope this makes it easier (or at least
   not harder) to apply this series. Applying on v6.4-rc1 should also
   work just fine.

The individual patches are all pairwise independent of each other, so
everyone can pick up the subset that suites them.

Best regards
UWe

Uwe Kleine-König (5):
  staging: iio: Switch i2c drivers back to use .probe()
  media: atomisp: Switch i2c drivers back to use .probe()
  media: staging: max96712: Switch i2c driver back to use .probe()
  staging: olpc_dcon: Switch i2c driver back to use .probe()
  staging: most: Switch i2c driver back to use .probe()

 drivers/staging/iio/addac/adt7316-i2c.c                   | 2 +-
 drivers/staging/iio/impedance-analyzer/ad5933.c           | 2 +-
 drivers/staging/media/atomisp/i2c/atomisp-gc0310.c        | 2 +-
 drivers/staging/media/atomisp/i2c/atomisp-gc2235.c        | 2 +-
 drivers/staging/media/atomisp/i2c/atomisp-lm3554.c        | 2 +-
 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c       | 2 +-
 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c        | 2 +-
 drivers/staging/media/atomisp/i2c/atomisp-ov2722.c        | 2 +-
 drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c | 2 +-
 drivers/staging/media/max96712/max96712.c                 | 2 +-
 drivers/staging/most/i2c/i2c.c                            | 2 +-
 drivers/staging/olpc_dcon/olpc_dcon.c                     | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

base-commit: cf09e328589a2ed7f6c8d90f2edb697fb4f8a96b
-- 
2.39.2

[PATCH v2 1/5] staging: iio: Switch i2c drivers back to use .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
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/staging/iio/addac/adt7316-i2c.c         | 2 +-
 drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/iio/addac/adt7316-i2c.c b/drivers/staging/iio/addac/adt7316-i2c.c
index 7e3d1a6f30ba..6c1f91c859ca 100644
--- a/drivers/staging/iio/addac/adt7316-i2c.c
+++ b/drivers/staging/iio/addac/adt7316-i2c.c
@@ -138,7 +138,7 @@ static struct i2c_driver adt7316_driver = {
 		.of_match_table = adt7316_of_match,
 		.pm = ADT7316_PM_OPS,
 	},
-	.probe_new = adt7316_i2c_probe,
+	.probe = adt7316_i2c_probe,
 	.id_table = adt7316_i2c_id,
 };
 module_i2c_driver(adt7316_driver);
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index b3152f7153fb..46db6d91542a 100644
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -781,7 +781,7 @@ static struct i2c_driver ad5933_driver = {
 		.name = "ad5933",
 		.of_match_table = ad5933_of_match,
 	},
-	.probe_new = ad5933_probe,
+	.probe = ad5933_probe,
 	.id_table = ad5933_id,
 };
 module_i2c_driver(ad5933_driver);
-- 
2.39.2

Re: [PATCH v2 1/5] staging: iio: Switch i2c drivers back to use .probe()

[Jonathan Cameron]

On Wed, 24 May 2023 17:16:42 +0200
Uwe Kleine-König <u.kleine-koenig@pengutronix.de> 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 <u.kleine-koenig@pengutronix.de>
Applied to the togreg branch of iio.git and pushed out as testing for
all the normal reasons.

Thanks,

Jonathan

> ---
>  drivers/staging/iio/addac/adt7316-i2c.c         | 2 +-
>  drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/iio/addac/adt7316-i2c.c b/drivers/staging/iio/addac/adt7316-i2c.c
> index 7e3d1a6f30ba..6c1f91c859ca 100644
> --- a/drivers/staging/iio/addac/adt7316-i2c.c
> +++ b/drivers/staging/iio/addac/adt7316-i2c.c
> @@ -138,7 +138,7 @@ static struct i2c_driver adt7316_driver = {
>  		.of_match_table = adt7316_of_match,
>  		.pm = ADT7316_PM_OPS,
>  	},
> -	.probe_new = adt7316_i2c_probe,
> +	.probe = adt7316_i2c_probe,
>  	.id_table = adt7316_i2c_id,
>  };
>  module_i2c_driver(adt7316_driver);
> diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
> index b3152f7153fb..46db6d91542a 100644
> --- a/drivers/staging/iio/impedance-analyzer/ad5933.c
> +++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
> @@ -781,7 +781,7 @@ static struct i2c_driver ad5933_driver = {
>  		.name = "ad5933",
>  		.of_match_table = ad5933_of_match,
>  	},
> -	.probe_new = ad5933_probe,
> +	.probe = ad5933_probe,
>  	.id_table = ad5933_id,
>  };
>  module_i2c_driver(ad5933_driver);

[PATCH v2 2/5] media: atomisp: Switch i2c drivers back to use .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
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/staging/media/atomisp/i2c/atomisp-gc0310.c        | 2 +-
 drivers/staging/media/atomisp/i2c/atomisp-gc2235.c        | 2 +-
 drivers/staging/media/atomisp/i2c/atomisp-lm3554.c        | 2 +-
 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c       | 2 +-
 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c        | 2 +-
 drivers/staging/media/atomisp/i2c/atomisp-ov2722.c        | 2 +-
 drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
index 273155308fe3..21eb4234a081 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
@@ -483,7 +483,7 @@ static struct i2c_driver gc0310_driver = {
 		.pm = pm_sleep_ptr(&gc0310_pm_ops),
 		.acpi_match_table = gc0310_acpi_match,
 	},
-	.probe_new = gc0310_probe,
+	.probe = gc0310_probe,
 	.remove = gc0310_remove,
 };
 module_i2c_driver(gc0310_driver);
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
index cb4c79b483ca..9fa390fbc5f3 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
@@ -864,7 +864,7 @@ static struct i2c_driver gc2235_driver = {
 		.name = "gc2235",
 		.acpi_match_table = gc2235_acpi_match,
 	},
-	.probe_new = gc2235_probe,
+	.probe = gc2235_probe,
 	.remove = gc2235_remove,
 };
 module_i2c_driver(gc2235_driver);
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
index c4ce4cd445d7..cf5d9317b11a 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
@@ -945,7 +945,7 @@ static struct i2c_driver lm3554_driver = {
 		.pm   = &lm3554_pm_ops,
 		.acpi_match_table = lm3554_acpi_match,
 	},
-	.probe_new = lm3554_probe,
+	.probe = lm3554_probe,
 	.remove = lm3554_remove,
 };
 module_i2c_driver(lm3554_driver);
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
index 0e5a981dd331..1c6643c442ef 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
@@ -1600,7 +1600,7 @@ static struct i2c_driver mt9m114_driver = {
 		.name = "mt9m114",
 		.acpi_match_table = mt9m114_acpi_match,
 	},
-	.probe_new = mt9m114_probe,
+	.probe = mt9m114_probe,
 	.remove = mt9m114_remove,
 };
 module_i2c_driver(mt9m114_driver);
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
index 63de214916f5..b5d93a96d588 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
@@ -719,7 +719,7 @@ static struct i2c_driver ov2680_driver = {
 		.pm = pm_sleep_ptr(&ov2680_pm_ops),
 		.acpi_match_table = ov2680_acpi_match,
 	},
-	.probe_new = ov2680_probe,
+	.probe = ov2680_probe,
 	.remove = ov2680_remove,
 };
 module_i2c_driver(ov2680_driver);
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
index 5d2e6e2e72f0..6a72691ed5b7 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
@@ -1019,7 +1019,7 @@ static struct i2c_driver ov2722_driver = {
 		.name = "ov2722",
 		.acpi_match_table = ov2722_acpi_match,
 	},
-	.probe_new = ov2722_probe,
+	.probe = ov2722_probe,
 	.remove = ov2722_remove,
 };
 module_i2c_driver(ov2722_driver);
diff --git a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
index da8c3b1d3bcd..c94fe8e861a5 100644
--- a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
+++ b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
@@ -1794,7 +1794,7 @@ static struct i2c_driver ov5693_driver = {
 		.name = "ov5693",
 		.acpi_match_table = ov5693_acpi_match,
 	},
-	.probe_new = ov5693_probe,
+	.probe = ov5693_probe,
 	.remove = ov5693_remove,
 };
 module_i2c_driver(ov5693_driver);
-- 
2.39.2

Re: [PATCH v2 2/5] media: atomisp: Switch i2c drivers back to use .probe()

[Hans de Goede]

Hi,

On 5/24/23 17:16, 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 <u.kleine-koenig@pengutronix.de>

Thank you for the patch. I have merged this into:

https://git.kernel.org/pub/scm/linux/kernel/git/hansg/linux.git/log/?h=media-atomisp

And I'll include this in the atomisp linux-media pull-req
which I send to Mauro around rc5 / rc6 time.

(I'm currently doing a lot of work on the atomisp code,
so merging this through my atomisp branch is best to
avoid conflicts)

Regards,

Hans




> ---
>  drivers/staging/media/atomisp/i2c/atomisp-gc0310.c        | 2 +-
>  drivers/staging/media/atomisp/i2c/atomisp-gc2235.c        | 2 +-
>  drivers/staging/media/atomisp/i2c/atomisp-lm3554.c        | 2 +-
>  drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c       | 2 +-
>  drivers/staging/media/atomisp/i2c/atomisp-ov2680.c        | 2 +-
>  drivers/staging/media/atomisp/i2c/atomisp-ov2722.c        | 2 +-
>  drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c | 2 +-
>  7 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
> index 273155308fe3..21eb4234a081 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
> @@ -483,7 +483,7 @@ static struct i2c_driver gc0310_driver = {
>  		.pm = pm_sleep_ptr(&gc0310_pm_ops),
>  		.acpi_match_table = gc0310_acpi_match,
>  	},
> -	.probe_new = gc0310_probe,
> +	.probe = gc0310_probe,
>  	.remove = gc0310_remove,
>  };
>  module_i2c_driver(gc0310_driver);
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
> index cb4c79b483ca..9fa390fbc5f3 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
> @@ -864,7 +864,7 @@ static struct i2c_driver gc2235_driver = {
>  		.name = "gc2235",
>  		.acpi_match_table = gc2235_acpi_match,
>  	},
> -	.probe_new = gc2235_probe,
> +	.probe = gc2235_probe,
>  	.remove = gc2235_remove,
>  };
>  module_i2c_driver(gc2235_driver);
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
> index c4ce4cd445d7..cf5d9317b11a 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
> @@ -945,7 +945,7 @@ static struct i2c_driver lm3554_driver = {
>  		.pm   = &lm3554_pm_ops,
>  		.acpi_match_table = lm3554_acpi_match,
>  	},
> -	.probe_new = lm3554_probe,
> +	.probe = lm3554_probe,
>  	.remove = lm3554_remove,
>  };
>  module_i2c_driver(lm3554_driver);
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
> index 0e5a981dd331..1c6643c442ef 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
> @@ -1600,7 +1600,7 @@ static struct i2c_driver mt9m114_driver = {
>  		.name = "mt9m114",
>  		.acpi_match_table = mt9m114_acpi_match,
>  	},
> -	.probe_new = mt9m114_probe,
> +	.probe = mt9m114_probe,
>  	.remove = mt9m114_remove,
>  };
>  module_i2c_driver(mt9m114_driver);
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
> index 63de214916f5..b5d93a96d588 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
> @@ -719,7 +719,7 @@ static struct i2c_driver ov2680_driver = {
>  		.pm = pm_sleep_ptr(&ov2680_pm_ops),
>  		.acpi_match_table = ov2680_acpi_match,
>  	},
> -	.probe_new = ov2680_probe,
> +	.probe = ov2680_probe,
>  	.remove = ov2680_remove,
>  };
>  module_i2c_driver(ov2680_driver);
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
> index 5d2e6e2e72f0..6a72691ed5b7 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
> @@ -1019,7 +1019,7 @@ static struct i2c_driver ov2722_driver = {
>  		.name = "ov2722",
>  		.acpi_match_table = ov2722_acpi_match,
>  	},
> -	.probe_new = ov2722_probe,
> +	.probe = ov2722_probe,
>  	.remove = ov2722_remove,
>  };
>  module_i2c_driver(ov2722_driver);
> diff --git a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
> index da8c3b1d3bcd..c94fe8e861a5 100644
> --- a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
> +++ b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
> @@ -1794,7 +1794,7 @@ static struct i2c_driver ov5693_driver = {
>  		.name = "ov5693",
>  		.acpi_match_table = ov5693_acpi_match,
>  	},
> -	.probe_new = ov5693_probe,
> +	.probe = ov5693_probe,
>  	.remove = ov5693_remove,
>  };
>  module_i2c_driver(ov5693_driver);

Re: [PATCH v2 2/5] media: atomisp: Switch i2c drivers back to use .probe()

[Uwe Kleine-König]

[-- Attachment #1: Type: text/plain, Size: 894 bytes --]

Hello,

On Wed, May 24, 2023 at 05:16:43PM +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 <u.kleine-koenig@pengutronix.de>

the four other patches from this series are already in next, this one
wasn't picked up yet though. There is another change for staging: media:
atomisp in next via Mauro's media-next (branch: fixes).

Who wants/should pick up this change?

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH v2 2/5] media: atomisp: Switch i2c drivers back to use .probe()

[Hans de Goede]

Hi Uwe,

On 6/11/23 13:07, Uwe Kleine-König wrote:
> Hello,
> 
> On Wed, May 24, 2023 at 05:16:43PM +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 <u.kleine-koenig@pengutronix.de>
> 
> the four other patches from this series are already in next, this one
> wasn't picked up yet though. There is another change for staging: media:
> atomisp in next via Mauro's media-next (branch: fixes).
> 
> Who wants/should pick up this change?

This patch is already in media-staging:

https://git.linuxtv.org/media_stage.git/log/?ofs=50
https://git.linuxtv.org/media_stage.git/commit/?id=625ac9af384481e8644e0653a4aa472aa95f0395

So this is on its way to -next already.

Regards,

Hans

Re: [PATCH v2 2/5] media: atomisp: Switch i2c drivers back to use .probe()

[Uwe Kleine-König]

[-- Attachment #1: Type: text/plain, Size: 1475 bytes --]

Hello Hans,

On Sun, Jun 11, 2023 at 09:16:41PM +0200, Hans de Goede wrote:
> On 6/11/23 13:07, Uwe Kleine-König wrote:
> > Hello,
> > 
> > On Wed, May 24, 2023 at 05:16:43PM +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 <u.kleine-koenig@pengutronix.de>
> > 
> > the four other patches from this series are already in next, this one
> > wasn't picked up yet though. There is another change for staging: media:
> > atomisp in next via Mauro's media-next (branch: fixes).
> > 
> > Who wants/should pick up this change?
> 
> This patch is already in media-staging:
> 
> https://git.linuxtv.org/media_stage.git/log/?ofs=50
> https://git.linuxtv.org/media_stage.git/commit/?id=625ac9af384481e8644e0653a4aa472aa95f0395
> 
> So this is on its way to -next already.

I admit I missed your mail from May 24 where you announced your PR
around -rc5/-rc6 time. Otherwise I wouldn't have bothered you and the
others. Sorry and thanks

Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[PATCH v2 3/5] media: staging: max96712: Switch i2c driver back to use .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
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/staging/media/max96712/max96712.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/media/max96712/max96712.c b/drivers/staging/media/max96712/max96712.c
index 99b333b68198..77943bdf3fb9 100644
--- a/drivers/staging/media/max96712/max96712.c
+++ b/drivers/staging/media/max96712/max96712.c
@@ -427,7 +427,7 @@ static struct i2c_driver max96712_i2c_driver = {
 		.name = "max96712",
 		.of_match_table	= of_match_ptr(max96712_of_table),
 	},
-	.probe_new = max96712_probe,
+	.probe = max96712_probe,
 	.remove = max96712_remove,
 };
 
-- 
2.39.2

[PATCH v2 4/5] staging: olpc_dcon: Switch i2c driver back to use .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
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/staging/olpc_dcon/olpc_dcon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
index 2fba52e0bd7b..d5271eac14f6 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -779,7 +779,7 @@ static struct i2c_driver dcon_driver = {
 	},
 	.class = I2C_CLASS_DDC | I2C_CLASS_HWMON,
 	.id_table = dcon_idtable,
-	.probe_new = dcon_probe,
+	.probe = dcon_probe,
 	.remove = dcon_remove,
 	.detect = dcon_detect,
 	.address_list = normal_i2c,
-- 
2.39.2

[PATCH v2 5/5] staging: most: Switch i2c driver back to use .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
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/staging/most/i2c/i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/most/i2c/i2c.c b/drivers/staging/most/i2c/i2c.c
index 4e85e681922f..ce869280a056 100644
--- a/drivers/staging/most/i2c/i2c.c
+++ b/drivers/staging/most/i2c/i2c.c
@@ -362,7 +362,7 @@ static struct i2c_driver i2c_driver = {
 	.driver = {
 		.name = "hdm_i2c",
 	},
-	.probe_new = i2c_probe,
+	.probe = i2c_probe,
 	.remove = i2c_remove,
 	.id_table = i2c_id,
 };
-- 
2.39.2