From: Uwe Kleine-König Date: Fri, 18 Nov 2022 22:44:43 +0000 (+0100) Subject: regulator: max8660: Convert to i2c's .probe_new() X-Git-Tag: v6.2-rc1~121^2~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbf31dac703009174226bb87b3914bd092040327;p=thirdparty%2Fkernel%2Flinux.git regulator: max8660: Convert to i2c's .probe_new() .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-550-uwe@kleine-koenig.org Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c index 347043a5a9a7d..711623be8eb5c 100644 --- a/drivers/regulator/max8660.c +++ b/drivers/regulator/max8660.c @@ -367,9 +367,9 @@ static inline int max8660_pdata_from_dt(struct device *dev, } #endif -static int max8660_probe(struct i2c_client *client, - const struct i2c_device_id *i2c_id) +static int max8660_probe(struct i2c_client *client) { + const struct i2c_device_id *i2c_id = i2c_client_get_device_id(client); struct device *dev = &client->dev; struct max8660_platform_data pdata_of, *pdata = dev_get_platdata(dev); struct regulator_config config = { }; @@ -503,7 +503,7 @@ static const struct i2c_device_id max8660_id[] = { MODULE_DEVICE_TABLE(i2c, max8660_id); static struct i2c_driver max8660_driver = { - .probe = max8660_probe, + .probe_new = max8660_probe, .driver = { .name = "max8660", },