mfd: wm8994: Convert to devm_regmap_init()
Subsystems (2)
PATCH 1/3 mfd: wm8994: Convert to devm_regmap_init()
Signed-off-by Mark Brown <[email protected]>
---
OK to take this via regmap, it's another new feature?
drivers/mfd/wm8994-core.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-)
drivers/mfd/wm8994-core.c +8 -10
@@ -401,7 +401,7 @@ static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq) NULL, 0);if (ret !=0 ) {dev_err (wm8994->dev,"Failed to add children: %d\n" , ret); - goto err_regmap; + goto err; }switch (wm8994->type) {
@@ -416,7 +416,7 @@ static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq)break ;default :BUG (); - goto err_regmap; + goto err; } wm8994->supplies = devm_kzalloc(wm8994->dev,
@@ -424,7 +424,7 @@ static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq) wm8994->num_supplies, GFP_KERNEL);if (!wm8994->supplies) { ret = -ENOMEM ; - goto err_regmap; + goto err; }switch (wm8994->type) {
@@ -442,14 +442,14 @@ static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq)break ;default :BUG (); - goto err_regmap; + goto err; } ret =regulator_bulk_get (wm8994->dev, wm8994->num_supplies, wm8994->supplies);if (ret !=0 ) {dev_err (wm8994->dev,"Failed to get supplies: %d\n" , ret); - goto err_regmap; + goto err; } ret = regulator_bulk_enable(wm8994->num_supplies,
@@ -581,7 +581,7 @@ static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq)if (ret !=0 ) {dev_err (wm8994->dev,"Failed to register patch: %d\n" , ret); - goto err_regmap; + goto err; } }
@@ -647,8 +647,7 @@ err_enable: wm8994->supplies); err_get:regulator_bulk_free (wm8994->num_supplies, wm8994->supplies); -err_regmap: -regmap_exit (wm8994->regmap); +err:mfd_remove_devices (wm8994->dev);return ret; }
@@ -661,7 +660,6 @@ static __devexit void wm8994_device_exit(struct wm8994 *wm8994)regulator_bulk_disable (wm8994->num_supplies, wm8994->supplies);regulator_bulk_free (wm8994->num_supplies, wm8994->supplies); -regmap_exit (wm8994->regmap); }static const struct of_device_id wm8994_of_match[] = {
@@ -687,7 +685,7 @@ static int wm8994_i2c_probe(struct i2c_client *i2c, wm8994->irq = i2c->irq; wm8994->type = id->driver_data; - wm8994->regmap =regmap_init_i2c (i2c, &wm8994_base_regmap_config); + wm8994->regmap =devm_regmap_init_i2c (i2c, &wm8994_base_regmap_config);if (IS_ERR (wm8994->regmap)) { ret =PTR_ERR (wm8994->regmap); dev_err(wm8994->dev, "Failed to allocate register map: %d\n",
Signature · 1 line
1.7.9.rc1
PATCH 2/3 mfd: wm831x: Convert to devm_regmap_init()
Signed-off-by Mark Brown <[email protected]>
---
OK to take this via regmap, it's another new feature?
drivers/mfd/wm831x-core.c | 20 +++++++++----------- drivers/mfd/wm831x-i2c.c | 2 +- drivers/mfd/wm831x-spi.c | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-)
drivers/mfd/wm831x-core.c +9 -11
@@ -1631,7 +1631,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq) ret =wm831x_reg_read (wm831x,WM831X_PARENT_ID );if (ret <0 ) {dev_err (wm831x->dev,"Failed to read parent ID: %d\n" , ret); - goto err_regmap; + goto err; }switch (ret) {case 0x6204 :
@@ -1640,20 +1640,20 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)default :dev_err (wm831x->dev,"Device is not a WM831x: ID %x\n" , ret); ret = -EINVAL ; - goto err_regmap; + goto err; } ret =wm831x_reg_read (wm831x,WM831X_REVISION );if (ret <0 ) {dev_err (wm831x->dev,"Failed to read revision: %d\n" , ret); - goto err_regmap; + goto err; } rev = (ret &WM831X_PARENT_REV_MASK ) >>WM831X_PARENT_REV_SHIFT ; ret =wm831x_reg_read (wm831x,WM831X_RESET_ID );if (ret <0 ) {dev_err (wm831x->dev,"Failed to read device ID: %d\n" , ret); - goto err_regmap; + goto err; }/* Some engineering samples do not have the ID set, rely on
@@ -1728,7 +1728,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)default :dev_err (wm831x->dev,"Unknown WM831x device %04x\n" , ret); ret = -EINVAL ; - goto err_regmap; + goto err; }/* This will need revisiting in future but is OK for all
@@ -1742,7 +1742,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq) ret =wm831x_reg_read (wm831x,WM831X_SECURITY_KEY );if (ret <0 ) {dev_err (wm831x->dev,"Failed to read security key: %d\n" , ret); - goto err_regmap; + goto err; }if (ret !=0 ) { dev_warn(wm831x->dev, "Security key had non-zero value %x\n",
@@ -1755,7 +1755,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq) ret = pdata->pre_init (wm831x);if (ret !=0 ) {dev_err (wm831x->dev,"pre_init() failed: %d\n" , ret); - goto err_regmap; + goto err; } }
@@ -1778,7 +1778,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq) ret =wm831x_irq_init (wm831x, irq);if (ret !=0 ) - goto err_regmap; + goto err;wm831x_auxadc_init (wm831x);
@@ -1874,9 +1874,8 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq) err_irq:wm831x_irq_exit (wm831x); -err_regmap: +err:mfd_remove_devices (wm831x->dev); -regmap_exit (wm831x->regmap);return ret; }
@@ -1887,7 +1886,6 @@ void wm831x_device_exit(struct wm831x *wm831x)if (wm831x->irq_base)free_irq (wm831x->irq_base +WM831X_IRQ_AUXADC_DATA , wm831x);wm831x_irq_exit (wm831x); -regmap_exit (wm831x->regmap); }int wm831x_device_suspend (struct wm831x *wm831x)
drivers/mfd/wm831x-i2c.c +1 -1
@@ -37,7 +37,7 @@ static int wm831x_i2c_probe(struct i2c_client *i2c,i2c_set_clientdata (i2c, wm831x); wm831x->dev = &i2c->dev; - wm831x->regmap =regmap_init_i2c (i2c, &wm831x_regmap_config); + wm831x->regmap =devm_regmap_init_i2c (i2c, &wm831x_regmap_config);if (IS_ERR (wm831x->regmap)) { ret =PTR_ERR (wm831x->regmap); dev_err(wm831x->dev, "Failed to allocate register map: %d\n",
drivers/mfd/wm831x-spi.c +1 -1
@@ -40,7 +40,7 @@ static int __devinit wm831x_spi_probe(struct spi_device *spi)dev_set_drvdata (&spi->dev, wm831x); wm831x->dev = &spi->dev; - wm831x->regmap =regmap_init_spi (spi, &wm831x_regmap_config); + wm831x->regmap =devm_regmap_init_spi (spi, &wm831x_regmap_config);if (IS_ERR (wm831x->regmap)) { ret =PTR_ERR (wm831x->regmap); dev_err(wm831x->dev, "Failed to allocate register map: %d\n",
Signature · 1 line
1.7.9.rc1
PATCH 3/3 mfd: wm8400: Convert to devm_regmap_init_i2c()
In reply to Mark BrownSigned-off-by Mark Brown <[email protected]>
---
OK to take this via regmap, it's another new feature?
drivers/mfd/wm8400-core.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
drivers/mfd/wm8400-core.c +2 -5
@@ -350,7 +350,7 @@ static int wm8400_i2c_probe(struct i2c_client *i2c, goto err; } - wm8400->regmap =regmap_init_i2c (i2c, &wm8400_regmap_config); + wm8400->regmap =devm_regmap_init_i2c (i2c, &wm8400_regmap_config);if (IS_ERR (wm8400->regmap)) { ret =PTR_ERR (wm8400->regmap); goto err;
@@ -361,12 +361,10 @@ static int wm8400_i2c_probe(struct i2c_client *i2c, ret =wm8400_init (wm8400, i2c->dev.platform_data);if (ret !=0 ) - goto map_err; + goto err;return 0 ; -map_err: -regmap_exit (wm8400->regmap); err:return ret; }
@@ -376,7 +374,6 @@ static int wm8400_i2c_remove(struct i2c_client *i2c)struct wm8400 *wm8400 =i2c_get_clientdata (i2c);wm8400_release (wm8400); -regmap_exit (wm8400->regmap);return 0 ; }
Signature · 1 line
1.7.9.rc1
Hi Mark,
Quoted 4 lines · Mark Brown
Signed-off-by Mark Brown <[email protected]>---
OK to take this via regmap, it's another new feature?
Yep, fine with me.
If needed:
Acked-by Samuel Ortiz <[email protected]>
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/