diff mbox series

[482/606] misc: ad525x_dpot-i2c: Convert to i2c's .probe_new()

Message ID 20221118224540.619276-483-uwe@kleine-koenig.org
State New
Headers show
Series None | expand

Commit Message

Uwe Kleine-König Nov. 18, 2022, 10:43 p.m. UTC
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

.probe_new() doesn't get the i2c_device_id * parameter, so determine
that explicitly in the probe function.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/misc/ad525x_dpot-i2c.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Uwe Kleine-König Feb. 11, 2023, 10:54 p.m. UTC | #1
Hello Greg,

On Fri, Nov 18, 2022 at 11:43:36PM +0100, Uwe Kleine-König wrote:
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> .probe_new() doesn't get the i2c_device_id * parameter, so determine
> that explicitly in the probe function.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

This is one of the very few patches that I didn't get a feedback for.
Given that I want to change the prototype of .probe after the upcoming
merge window, it would be great to get this patch either applied during
the merge window (my preferred option) or at least get an Ack to get
this patch in via the i2c tree together with the patch changing .probe.

In case you don't have the original any more:

	https://lore.kernel.org/r/20221118224540.619276-483-uwe@kleine-koenig.org

Best regards
Uwe
diff mbox series

Patch

diff --git a/drivers/misc/ad525x_dpot-i2c.c b/drivers/misc/ad525x_dpot-i2c.c
index 28ffb4377d98..3856d5c04c5f 100644
--- a/drivers/misc/ad525x_dpot-i2c.c
+++ b/drivers/misc/ad525x_dpot-i2c.c
@@ -50,9 +50,9 @@  static const struct ad_dpot_bus_ops bops = {
 	.write_r8d16	= write_r8d16,
 };
 
-static int ad_dpot_i2c_probe(struct i2c_client *client,
-				      const struct i2c_device_id *id)
+static int ad_dpot_i2c_probe(struct i2c_client *client)
 {
+	const struct i2c_device_id *id = i2c_client_get_device_id(client);
 	struct ad_dpot_bus_data bdata = {
 		.client = client,
 		.bops = &bops,
@@ -106,7 +106,7 @@  static struct i2c_driver ad_dpot_i2c_driver = {
 	.driver = {
 		.name	= "ad_dpot",
 	},
-	.probe		= ad_dpot_i2c_probe,
+	.probe_new	= ad_dpot_i2c_probe,
 	.remove		= ad_dpot_i2c_remove,
 	.id_table	= ad_dpot_id,
 };