diff options
| author |   Axel Lin <axel.lin@gmail.com> | 2012-04-25 10:03:44 +0800 |
|---|---|---|
| committer |   Samuel Ortiz <sameo@linux.intel.com> | 2012-05-09 17:50:53 +0200 |
| commit | 1092e1c761dd0dc92a431085e322956d91d057a6 (patch) | |
| tree | 042f96afa74f3d149705ba483bd2ba8f23f077a9 /drivers | |
| parent | mfd: Convert rc5t583 to devm_regmap_init_i2c() (diff) | |
| download | linux-dev-1092e1c761dd0dc92a431085e322956d91d057a6.tar.xz linux-dev-1092e1c761dd0dc92a431085e322956d91d057a6.zip | |
mfd: Convert s5m-core to devm_regmap_init_i2c()
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/s5m-core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mfd/s5m-core.c b/drivers/mfd/s5m-core.c index 48949d998d10..dd170307e60e 100644 --- a/drivers/mfd/s5m-core.c +++ b/drivers/mfd/s5m-core.c @@ -114,12 +114,12 @@ static int s5m87xx_i2c_probe(struct i2c_client *i2c, s5m87xx->wakeup = pdata->wakeup; } - s5m87xx->regmap = regmap_init_i2c(i2c, &s5m_regmap_config); + s5m87xx->regmap = devm_regmap_init_i2c(i2c, &s5m_regmap_config); if (IS_ERR(s5m87xx->regmap)) { ret = PTR_ERR(s5m87xx->regmap); dev_err(&i2c->dev, "Failed to allocate register map: %d\n", ret); - goto err; + return ret; } s5m87xx->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR); @@ -159,7 +159,6 @@ err: mfd_remove_devices(s5m87xx->dev); s5m_irq_exit(s5m87xx); i2c_unregister_device(s5m87xx->rtc); - regmap_exit(s5m87xx->regmap); return ret; } @@ -170,7 +169,6 @@ static int s5m87xx_i2c_remove(struct i2c_client *i2c) mfd_remove_devices(s5m87xx->dev); s5m_irq_exit(s5m87xx); i2c_unregister_device(s5m87xx->rtc); - regmap_exit(s5m87xx->regmap); return 0; } |