leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mfd: Convert wm831x core driver to devm_kzalloc()

Browse Source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Mark Brown 2011-10-25 14:47:40 +02:00 committed by Samuel Ortiz
parent 805a6af8db
commit d48cbb7435
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mfd/wm831x-core.c
View File

@ -1875,7 +1875,6 @@ err_irq:
err_regmap: err_regmap:
mfd_remove_devices(wm831x->dev); mfd_remove_devices(wm831x->dev);
regmap_exit(wm831x->regmap); regmap_exit(wm831x->regmap);
kfree(wm831x);
return ret; return ret;
} }
@ -1887,7 +1886,6 @@ void wm831x_device_exit(struct wm831x *wm831x)
free_irq(wm831x->irq_base + WM831X_IRQ_AUXADC_DATA, wm831x); free_irq(wm831x->irq_base + WM831X_IRQ_AUXADC_DATA, wm831x);
wm831x_irq_exit(wm831x); wm831x_irq_exit(wm831x);
regmap_exit(wm831x->regmap); regmap_exit(wm831x->regmap);
kfree(wm831x);
} }
int wm831x_device_suspend(struct wm831x *wm831x) int wm831x_device_suspend(struct wm831x *wm831x)

3
drivers/mfd/wm831x-i2c.c
View File

@ -30,7 +30,7 @@ static int wm831x_i2c_probe(struct i2c_client *i2c,
struct wm831x *wm831x; struct wm831x *wm831x;
int ret; int ret;
wm831x = kzalloc(sizeof(struct wm831x), GFP_KERNEL); wm831x = devm_kzalloc(&i2c->dev, sizeof(struct wm831x), GFP_KERNEL);
if (wm831x == NULL) if (wm831x == NULL)
return -ENOMEM; return -ENOMEM;
@ -42,7 +42,6 @@ static int wm831x_i2c_probe(struct i2c_client *i2c,
ret = PTR_ERR(wm831x->regmap); ret = PTR_ERR(wm831x->regmap);
dev_err(wm831x->dev, "Failed to allocate register map: %d\n", dev_err(wm831x->dev, "Failed to allocate register map: %d\n",
ret); ret);
kfree(wm831x);
return ret; return ret;
} }

3
drivers/mfd/wm831x-spi.c
View File

@ -30,7 +30,7 @@ static int __devinit wm831x_spi_probe(struct spi_device *spi)
type = (enum wm831x_parent)id->driver_data; type = (enum wm831x_parent)id->driver_data;
wm831x = kzalloc(sizeof(struct wm831x), GFP_KERNEL); wm831x = devm_kzalloc(&spi->dev, sizeof(struct wm831x), GFP_KERNEL);
if (wm831x == NULL) if (wm831x == NULL)
return -ENOMEM; return -ENOMEM;
@ -45,7 +45,6 @@ static int __devinit wm831x_spi_probe(struct spi_device *spi)
ret = PTR_ERR(wm831x->regmap); ret = PTR_ERR(wm831x->regmap);
dev_err(wm831x->dev, "Failed to allocate register map: %d\n", dev_err(wm831x->dev, "Failed to allocate register map: %d\n",
ret); ret);
kfree(wm831x);
return ret; return ret;
} }