diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-17 01:34:28 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-17 01:34:28 +0200 |
| commit | d0175e7e78ef6dddf13a67f968332b3e44a5995d (patch) | |
| tree | 885cb99021f6d16a3cbc400405654223e8359731 /drivers/regulator/ad5398.c | |
| parent | regulator: palmas: configure enable time for LDOs (diff) | |
| parent | regulator: core: Split devres code out into a separate file (diff) | |
| download | linux-d0175e7e78ef6dddf13a67f968332b3e44a5995d.tar.xz linux-d0175e7e78ef6dddf13a67f968332b3e44a5995d.zip | |
Merge remote-tracking branch 'regulator/topic/devm' into regulator-palmas
Conflicts:
drivers/regulator/palmas-regulator.c
Diffstat (limited to 'drivers/regulator/ad5398.c')
| -rw-r--r-- | drivers/regulator/ad5398.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c index b2b203cb6b2f..48016a050d5f 100644 --- a/drivers/regulator/ad5398.c +++ b/drivers/regulator/ad5398.c @@ -219,7 +219,6 @@ static int ad5398_probe(struct i2c_client *client, struct ad5398_chip_info *chip; const struct ad5398_current_data_format *df = (struct ad5398_current_data_format *)id->driver_data; - int ret; if (!init_data) return -EINVAL; @@ -240,33 +239,21 @@ static int ad5398_probe(struct i2c_client *client, chip->current_offset = df->current_offset; chip->current_mask = (chip->current_level - 1) << chip->current_offset; - chip->rdev = regulator_register(&ad5398_reg, &config); + chip->rdev = devm_regulator_register(&client->dev, &ad5398_reg, + &config); if (IS_ERR(chip->rdev)) { - ret = PTR_ERR(chip->rdev); dev_err(&client->dev, "failed to register %s %s\n", id->name, ad5398_reg.name); - goto err; + return PTR_ERR(chip->rdev); } i2c_set_clientdata(client, chip); dev_dbg(&client->dev, "%s regulator driver is registered.\n", id->name); return 0; - -err: - return ret; -} - -static int ad5398_remove(struct i2c_client *client) -{ - struct ad5398_chip_info *chip = i2c_get_clientdata(client); - - regulator_unregister(chip->rdev); - return 0; } static struct i2c_driver ad5398_driver = { .probe = ad5398_probe, - .remove = ad5398_remove, .driver = { .name = "ad5398", }, |