mfd: Convert da9052 to use devm_* APIs

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

1 files changed, 5 insertions, 13 deletions

diff --git a/drivers/mfd/da9052-spi.c b/drivers/mfd/da9052-spi.c
index 6e09498c2c80..dbeadc5a6436 100644
--- a/drivers/mfd/da9052-spi.c
+++ b/drivers/mfd/da9052-spi.c
@@ -25,8 +25,9 @@ static int __devinit da9052_spi_probe(struct spi_device *spi)
 {
         int ret;
         const struct spi_device_id *id = spi_get_device_id(spi);
-        struct da9052 *da9052 = kzalloc(sizeof(struct da9052), GFP_KERNEL);
+        struct da9052 *da9052;
 
+        da9052 = devm_kzalloc(&spi->dev, sizeof(struct da9052), GFP_KERNEL);
         if (!da9052)
                 return -ENOMEM;
 
@@ -42,25 +43,19 @@ static int __devinit da9052_spi_probe(struct spi_device *spi)
         da9052_regmap_config.read_flag_mask = 1;
         da9052_regmap_config.write_flag_mask = 0;
 
-        da9052->regmap = regmap_init_spi(spi, &da9052_regmap_config);
+        da9052->regmap = devm_regmap_init_spi(spi, &da9052_regmap_config);
         if (IS_ERR(da9052->regmap)) {
                 ret = PTR_ERR(da9052->regmap);
                 dev_err(&spi->dev, "Failed to allocate register map: %d\n",
                         ret);
-                goto err;
+                return ret;
         }
 
         ret = da9052_device_init(da9052, id->driver_data);
         if (ret != 0)
-                goto err_regmap;
+                return ret;
 
         return 0;
-
-err_regmap:
-        regmap_exit(da9052->regmap);
-err:
-        kfree(da9052);
-        return ret;
 }
 
 static int __devexit da9052_spi_remove(struct spi_device *spi)
@@ -68,9 +63,6 @@ static int __devexit da9052_spi_remove(struct spi_device *spi)
         struct da9052 *da9052 = dev_get_drvdata(&spi->dev);
 
         da9052_device_exit(da9052);
-        regmap_exit(da9052->regmap);
-        kfree(da9052);
-
         return 0;
 }