diff options
| author | Mark Brown <broonie@kernel.org> | 2020-01-23 12:37:06 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-01-23 12:37:06 +0000 |
| commit | 9909f7986a8159200eaa8320ea081f337ebdd940 (patch) | |
| tree | 55f12c3c835b1deb716e0d0a06762790a21097c1 /drivers/regulator/ltc3676.c | |
| parent | f7abb7e33b295a3556b7e86ba3dbb7390e7880af (diff) | |
| parent | 53ba2f1aa3860f7ea0bf81543aab4a66af3f01d0 (diff) | |
| download | linux-9909f7986a8159200eaa8320ea081f337ebdd940.tar.bz2 | |
Merge branch 'regulator-5.6' into regulator-next
Diffstat (limited to 'drivers/regulator/ltc3676.c')
| -rw-r--r-- | drivers/regulator/ltc3676.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/regulator/ltc3676.c b/drivers/regulator/ltc3676.c index d934540eb8c4..e12e52c69e52 100644 --- a/drivers/regulator/ltc3676.c +++ b/drivers/regulator/ltc3676.c @@ -301,8 +301,7 @@ static irqreturn_t ltc3676_isr(int irq, void *dev_id) return IRQ_HANDLED; } -static int ltc3676_regulator_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ltc3676_regulator_probe(struct i2c_client *client) { struct device *dev = &client->dev; struct regulator_init_data *init_data = dev_get_platdata(dev); @@ -380,7 +379,7 @@ static struct i2c_driver ltc3676_driver = { .name = DRIVER_NAME, .of_match_table = of_match_ptr(ltc3676_of_match), }, - .probe = ltc3676_regulator_probe, + .probe_new = ltc3676_regulator_probe, .id_table = ltc3676_i2c_id, }; module_i2c_driver(ltc3676_driver); |