From 69518d21deaa448be65b7c0be67aab230e88eaa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Fri, 18 Nov 2022 23:44:36 +0100 Subject: [PATCH] regulator: isl6271a-regulator: Convert to i2c's .probe_new() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit .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 Acked-for-MFD-by: Lee Jones Acked-for-Backlight-by: Lee Jones Link: https://lore.kernel.org/r/20221118224540.619276-543-uwe@kleine-koenig.org Signed-off-by: Mark Brown --- drivers/regulator/isl6271a-regulator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/isl6271a-regulator.c b/drivers/regulator/isl6271a-regulator.c index 591a64e1ca61..b23b052eab10 100644 --- a/drivers/regulator/isl6271a-regulator.c +++ b/drivers/regulator/isl6271a-regulator.c @@ -97,9 +97,9 @@ static const struct regulator_desc isl_rd[] = { }, }; -static int isl6271a_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int isl6271a_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); struct regulator_dev *rdev; struct regulator_config config = { }; struct regulator_init_data *init_data = dev_get_platdata(&i2c->dev); @@ -148,7 +148,7 @@ static struct i2c_driver isl6271a_i2c_driver = { .driver = { .name = "isl6271a", }, - .probe = isl6271a_probe, + .probe_new = isl6271a_probe, .id_table = isl6271a_id, };