[PATCH v2 0/9] i2c: Switch .probe() to not take an id parameter

[PATCH v2 0/9] i2c: Switch .probe() to not take an id parameter

[Uwe Kleine-König]

Hello,

this is v2 of the series. I send it a bit earlier than I planned to do that
initially because I failed to send v1 completely to the linux-i2c list.

Changes since (implicit) v1:
 - Added Acks for patches #5, #6 and #8
 - Fixed kernel doc as pointed out by Luca Ceresoli (patch #7)
 - Send all patches to linux-i2c mailing list
 - Rebased to current Linus' tree.
   This reduces the list of prerequisite patches to two.

I updated

	https://git.pengutronix.de/git/ukl/linux i2c-probe-new

accordingly.

Best regards
Uwe

Uwe Kleine-König (9):
  misc: ad525x_dpot-i2c: Convert to i2c's .probe_new()
  mtd: maps: pismo: Convert to i2c's .probe_new()
  serial: sc16is7xx: Convert to i2c's .probe_new()
  w1: ds2482: Convert to i2c's .probe_new()
  media: i2c: ov5695: convert to i2c's .probe_new()
  media: i2c: ov2685: convert to i2c's .probe_new()
  i2c: Switch .probe() to not take an id parameter
  i2c: mux: Convert all drivers to new .probe() callback
  i2c: Convert drivers to new .probe() callback

 drivers/i2c/i2c-core-base.c         | 13 +++----------
 drivers/i2c/i2c-slave-eeprom.c      |  2 +-
 drivers/i2c/i2c-slave-testunit.c    |  2 +-
 drivers/i2c/i2c-smbus.c             |  2 +-
 drivers/i2c/muxes/i2c-mux-ltc4306.c |  2 +-
 drivers/i2c/muxes/i2c-mux-pca9541.c |  2 +-
 drivers/i2c/muxes/i2c-mux-pca954x.c |  2 +-
 drivers/media/i2c/ov2685.c          |  5 ++---
 drivers/media/i2c/ov5695.c          |  5 ++---
 drivers/misc/ad525x_dpot-i2c.c      |  6 +++---
 drivers/mtd/maps/pismo.c            |  5 ++---
 drivers/tty/serial/sc16is7xx.c      |  6 +++---
 drivers/w1/masters/ds2482.c         |  5 ++---
 include/linux/i2c.h                 | 18 +++++++++++-------
 14 files changed, 34 insertions(+), 41 deletions(-)


base-commit: f3a2439f20d918930cc4ae8f76fe1c1afd26958f
prerequisite-patch-id: 256857b4eee79540b271b8d4899b9ba0aa3c4c27
prerequisite-patch-id: bb49c9c71311ac1f1056c562f20f26aa356c95a6
-- 
2.39.1

[PATCH v2 5/9] media: i2c: ov5695: convert to i2c's .probe_new()

[Uwe Kleine-König]

The probe function doesn't make use of the i2c_device_id * parameter so
it can be trivially converted.

Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Link: https://lore.kernel.org/lkml/20221121102705.16092-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/media/i2c/ov5695.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/i2c/ov5695.c b/drivers/media/i2c/ov5695.c
index 61906fc54e37..b287c28920a6 100644
--- a/drivers/media/i2c/ov5695.c
+++ b/drivers/media/i2c/ov5695.c
@@ -1267,8 +1267,7 @@ static int ov5695_configure_regulators(struct ov5695 *ov5695)
 				       ov5695->supplies);
 }
 
-static int ov5695_probe(struct i2c_client *client,
-			const struct i2c_device_id *id)
+static int ov5695_probe(struct i2c_client *client)
 {
 	struct device *dev = &client->dev;
 	struct ov5695 *ov5695;
@@ -1393,7 +1392,7 @@ static struct i2c_driver ov5695_i2c_driver = {
 		.pm = &ov5695_pm_ops,
 		.of_match_table = of_match_ptr(ov5695_of_match),
 	},
-	.probe		= &ov5695_probe,
+	.probe_new	= &ov5695_probe,
 	.remove		= &ov5695_remove,
 };
 
-- 
2.39.1

[PATCH v2 6/9] media: i2c: ov2685: convert to i2c's .probe_new()

[Uwe Kleine-König]

The probe function doesn't make use of the i2c_device_id * parameter so
it can be trivially converted.

Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Link: https://lore.kernel.org/lkml/20221121102838.16448-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/media/i2c/ov2685.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/i2c/ov2685.c b/drivers/media/i2c/ov2685.c
index a3b524f15d89..1c80b121e7d6 100644
--- a/drivers/media/i2c/ov2685.c
+++ b/drivers/media/i2c/ov2685.c
@@ -707,8 +707,7 @@ static int ov2685_configure_regulators(struct ov2685 *ov2685)
 				       ov2685->supplies);
 }
 
-static int ov2685_probe(struct i2c_client *client,
-			const struct i2c_device_id *id)
+static int ov2685_probe(struct i2c_client *client)
 {
 	struct device *dev = &client->dev;
 	struct ov2685 *ov2685;
@@ -830,7 +829,7 @@ static struct i2c_driver ov2685_i2c_driver = {
 		.pm = &ov2685_pm_ops,
 		.of_match_table = of_match_ptr(ov2685_of_match),
 	},
-	.probe		= &ov2685_probe,
+	.probe_new	= &ov2685_probe,
 	.remove		= &ov2685_remove,
 };
 
-- 
2.39.1

Re: [PATCH v2 0/9] i2c: Switch .probe() to not take an id parameter

[Uwe Kleine-König]

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

Hello,

On Sun, Feb 26, 2023 at 11:26:45PM +0100, Uwe Kleine-König wrote:
> this is v2 of the series. I send it a bit earlier than I planned to do that
> initially because I failed to send v1 completely to the linux-i2c list.
> 
> Changes since (implicit) v1:
>  - Added Acks for patches #5, #6 and #8
>  - Fixed kernel doc as pointed out by Luca Ceresoli (patch #7)
>  - Send all patches to linux-i2c mailing list
>  - Rebased to current Linus' tree.
>    This reduces the list of prerequisite patches to two.
> 
> I updated
> 
> 	https://git.pengutronix.de/git/ukl/linux i2c-probe-new
> 
> accordingly.

Linus tree now contains all patches that are a prerequisite for this
series. I rebased the above branch again on top of linus/master and now
it contains only the change sets included in this series.

Also no unexpected new usages of .probe() appeared in Linus's tree (nor
in next). Also there are no changes to any of the files touched by this
series in next.

So this series is ready to be applied once Linus cuts -rc1.

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 0/9] i2c: Switch .probe() to not take an id parameter

[Wolfram Sang]

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


> So this series is ready to be applied once Linus cuts -rc1.

I applied it to for-current now and plan to have it in -rc2. Thank you!


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

Re: [PATCH v2 0/9] i2c: Switch .probe() to not take an id parameter

[Uwe Kleine-König]

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

On Thu, Mar 09, 2023 at 10:12:14PM +0100, Wolfram Sang wrote:
> 
> > So this series is ready to be applied once Linus cuts -rc1.
> 
> I applied it to for-current now and plan to have it in -rc2. Thank you!

Great, this is even quicker than I anticipated. I thought this will go
into next first and into mainline only during the next merge window.

If you can convince Linus to take that for -rc2, fine for me.

Best regards 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 --]