mfd: tps65912: Convert to managed resources for allocating memory

Saves on code and simplifies the driver, as these resources are now
tracked and freed automatically when the driver is realised.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/mfd/tps65912-core.c b/drivers/mfd/tps65912-core.c
index aeb8e40ab4249ac2acdbdb43d7149ca8ca5efde4..479886a4cf8054b60750303cc092c88128331c9d 100644 (file)
--- a/drivers/mfd/tps65912-core.c
+++ b/drivers/mfd/tps65912-core.c
@@ -162,7 +162,6 @@ int tps65912_device_init(struct tps65912 *tps65912)
 err:
        kfree(init_data);
        mfd_remove_devices(tps65912->dev);
-       kfree(tps65912);
        return ret;
 }
 
@@ -170,7 +169,6 @@ void tps65912_device_exit(struct tps65912 *tps65912)
 {
        mfd_remove_devices(tps65912->dev);
        tps65912_irq_exit(tps65912);
-       kfree(tps65912);
 }
 
 MODULE_AUTHOR("Margarita Olaya <magi@slimlogic.co.uk>");

diff --git a/drivers/mfd/tps65912-i2c.c b/drivers/mfd/tps65912-i2c.c
index c041f2c3d2bdd01190fd7bbc72d17acb6228c51f..6a6343ee95fe7dd1d9b7630e53c0e1fff2a07f40 100644 (file)
--- a/drivers/mfd/tps65912-i2c.c
+++ b/drivers/mfd/tps65912-i2c.c
@@ -77,7 +77,8 @@ static int tps65912_i2c_probe(struct i2c_client *i2c,
 {
        struct tps65912 *tps65912;
 
-       tps65912 = kzalloc(sizeof(struct tps65912), GFP_KERNEL);
+       tps65912 = devm_kzalloc(&i2c->dev,
+                               sizeof(struct tps65912), GFP_KERNEL);
        if (tps65912 == NULL)
                return -ENOMEM;
 

diff --git a/drivers/mfd/tps65912-spi.c b/drivers/mfd/tps65912-spi.c
index b45f460d299fe24218c176e88f56ac03710c6e9e..69a5178bf152a01aca63059778749715f65ed12f 100644 (file)
--- a/drivers/mfd/tps65912-spi.c
+++ b/drivers/mfd/tps65912-spi.c
@@ -85,7 +85,8 @@ static int tps65912_spi_probe(struct spi_device *spi)
 {
        struct tps65912 *tps65912;
 
-       tps65912 = kzalloc(sizeof(struct tps65912), GFP_KERNEL);
+       tps65912 = devm_kzalloc(&spi->dev,
+                               sizeof(struct tps65912), GFP_KERNEL);
        if (tps65912 == NULL)
                return -ENOMEM;