[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);