Skip to content

Commit dbf31da

Browse files
Uwe Kleine-Königbroonie
authored andcommitted
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 <[email protected]> Acked-for-MFD-by: Lee Jones <[email protected]> Acked-for-Backlight-by: Lee Jones <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 78c8f6c commit dbf31da

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/regulator/max8660.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,9 @@ static inline int max8660_pdata_from_dt(struct device *dev,
367367
}
368368
#endif
369369

370-
static int max8660_probe(struct i2c_client *client,
371-
const struct i2c_device_id *i2c_id)
370+
static int max8660_probe(struct i2c_client *client)
372371
{
372+
const struct i2c_device_id *i2c_id = i2c_client_get_device_id(client);
373373
struct device *dev = &client->dev;
374374
struct max8660_platform_data pdata_of, *pdata = dev_get_platdata(dev);
375375
struct regulator_config config = { };
@@ -503,7 +503,7 @@ static const struct i2c_device_id max8660_id[] = {
503503
MODULE_DEVICE_TABLE(i2c, max8660_id);
504504

505505
static struct i2c_driver max8660_driver = {
506-
.probe = max8660_probe,
506+
.probe_new = max8660_probe,
507507
.driver = {
508508
.name = "max8660",
509509
},

0 commit comments

Comments
 (0)