Input: wm831x-on - convert to devm_kzalloc()

Saves a small amount of code and reduces the potential for leaks.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Mark Brown 2012-10-11 00:42:34 -07:00 коммит произвёл Dmitry Torokhov
Родитель ef8dee5cfe
Коммит dae6ba4ab7
1 изменённых файлов: 2 добавлений и 3 удалений

Просмотреть файл

@ -76,7 +76,8 @@ static int __devinit wm831x_on_probe(struct platform_device *pdev)
int irq = wm831x_irq(wm831x, platform_get_irq(pdev, 0)); int irq = wm831x_irq(wm831x, platform_get_irq(pdev, 0));
int ret; int ret;
wm831x_on = kzalloc(sizeof(struct wm831x_on), GFP_KERNEL); wm831x_on = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_on),
GFP_KERNEL);
if (!wm831x_on) { if (!wm831x_on) {
dev_err(&pdev->dev, "Can't allocate data\n"); dev_err(&pdev->dev, "Can't allocate data\n");
return -ENOMEM; return -ENOMEM;
@ -120,7 +121,6 @@ err_irq:
err_input_dev: err_input_dev:
input_free_device(wm831x_on->dev); input_free_device(wm831x_on->dev);
err: err:
kfree(wm831x_on);
return ret; return ret;
} }
@ -132,7 +132,6 @@ static int __devexit wm831x_on_remove(struct platform_device *pdev)
free_irq(irq, wm831x_on); free_irq(irq, wm831x_on);
cancel_delayed_work_sync(&wm831x_on->work); cancel_delayed_work_sync(&wm831x_on->work);
input_unregister_device(wm831x_on->dev); input_unregister_device(wm831x_on->dev);
kfree(wm831x_on);
return 0; return 0;
} }