diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-25 08:47:40 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-01-08 18:37:28 -0500 |
commit | d48cbb74357b42b86ac8edc3bc34bcb3d65a12d9 (patch) | |
tree | 382e5c0c68f9beb8cc74235a84dfd861079a92ff /drivers/mfd/wm831x-core.c | |
parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) |
mfd: Convert wm831x core driver to devm_kzalloc()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/wm831x-core.c')
-rw-r--r-- | drivers/mfd/wm831x-core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c index 0a2b8d41a702..3b761893f9ba 100644 --- a/drivers/mfd/wm831x-core.c +++ b/drivers/mfd/wm831x-core.c | |||
@@ -1875,7 +1875,6 @@ err_irq: | |||
1875 | err_regmap: | 1875 | err_regmap: |
1876 | mfd_remove_devices(wm831x->dev); | 1876 | mfd_remove_devices(wm831x->dev); |
1877 | regmap_exit(wm831x->regmap); | 1877 | regmap_exit(wm831x->regmap); |
1878 | kfree(wm831x); | ||
1879 | return ret; | 1878 | return ret; |
1880 | } | 1879 | } |
1881 | 1880 | ||
@@ -1887,7 +1886,6 @@ void wm831x_device_exit(struct wm831x *wm831x) | |||
1887 | free_irq(wm831x->irq_base + WM831X_IRQ_AUXADC_DATA, wm831x); | 1886 | free_irq(wm831x->irq_base + WM831X_IRQ_AUXADC_DATA, wm831x); |
1888 | wm831x_irq_exit(wm831x); | 1887 | wm831x_irq_exit(wm831x); |
1889 | regmap_exit(wm831x->regmap); | 1888 | regmap_exit(wm831x->regmap); |
1890 | kfree(wm831x); | ||
1891 | } | 1889 | } |
1892 | 1890 | ||
1893 | int wm831x_device_suspend(struct wm831x *wm831x) | 1891 | int wm831x_device_suspend(struct wm831x *wm831x) |