Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mfd: cros_ec: Convert to managed resources for allocating memory

Browse source 
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Lee Jones 2013-05-23 16:25:10 +01:00 committed by Samuel Ortiz
parent 1cee87fdf1
commit 22f9ee756b
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/mfd/cros_ec.c
View file

@ -104,23 +104,19 @@ int cros_ec_register(struct cros_ec_device *ec_dev)
ec_dev->command_sendrecv = cros_ec_command_sendrecv; ec_dev->command_sendrecv = cros_ec_command_sendrecv;
if (ec_dev->din_size) { if (ec_dev->din_size) {
ec_dev->din = kmalloc(ec_dev->din_size, GFP_KERNEL); ec_dev->din = devm_kzalloc(dev, ec_dev->din_size, GFP_KERNEL);
if (!ec_dev->din) { if (!ec_dev->din)
err = -ENOMEM; return -ENOMEM;
goto fail_din;
}
} }
if (ec_dev->dout_size) { if (ec_dev->dout_size) {
ec_dev->dout = kmalloc(ec_dev->dout_size, GFP_KERNEL); ec_dev->dout = devm_kzalloc(dev, ec_dev->dout_size, GFP_KERNEL);
if (!ec_dev->dout) { if (!ec_dev->dout)
err = -ENOMEM; return -ENOMEM;
goto fail_dout;
}
} }
if (!ec_dev->irq) { if (!ec_dev->irq) {
dev_dbg(dev, "no valid IRQ: %d\n", ec_dev->irq); dev_dbg(dev, "no valid IRQ: %d\n", ec_dev->irq);
goto fail_irq; return err;
} }
err = request_threaded_irq(ec_dev->irq, NULL, ec_irq_thread, err = request_threaded_irq(ec_dev->irq, NULL, ec_irq_thread,
@ -128,7 +124,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev)
"chromeos-ec", ec_dev); "chromeos-ec", ec_dev);
if (err) { if (err) {
dev_err(dev, "request irq %d: error %d\n", ec_dev->irq, err); dev_err(dev, "request irq %d: error %d\n", ec_dev->irq, err);
goto fail_irq; return err;
} }
err = mfd_add_devices(dev, 0, cros_devs, err = mfd_add_devices(dev, 0, cros_devs,
@ -145,11 +141,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev)
fail_mfd: fail_mfd:
free_irq(ec_dev->irq, ec_dev); free_irq(ec_dev->irq, ec_dev);
fail_irq:
kfree(ec_dev->dout);
fail_dout:
kfree(ec_dev->din);
fail_din:
return err; return err;
} }
EXPORT_SYMBOL(cros_ec_register); EXPORT_SYMBOL(cros_ec_register);
@ -158,8 +150,6 @@ int cros_ec_remove(struct cros_ec_device *ec_dev)
{ {
mfd_remove_devices(ec_dev->dev); mfd_remove_devices(ec_dev->dev);
free_irq(ec_dev->irq, ec_dev); free_irq(ec_dev->irq, ec_dev);
kfree(ec_dev->dout);
kfree(ec_dev->din);
return 0; return 0;
} }