Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux...

[karo-tx-linux.git] / drivers / mfd / max77686.c

diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index 1cbb17609c8b73ac8159aeef58ad7a595066bfc0..f27a21831583b2e94e06424384deee76f916e03a 100644 (file)
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -37,6 +37,7 @@
 static struct mfd_cell max77686_devs[] = {
        { .name = "max77686-pmic", },
        { .name = "max77686-rtc", },
+       { .name = "max77686-clk", },
 };
 
 static struct regmap_config max77686_regmap_config = {
@@ -84,12 +85,12 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
                pdata = max77686_i2c_parse_dt_pdata(&i2c->dev);
 
        if (!pdata) {
-               ret = -EIO;
                dev_err(&i2c->dev, "No platform data found.\n");
-               goto err;
+               return -EIO;
        }
 
-       max77686 = kzalloc(sizeof(struct max77686_dev), GFP_KERNEL);
+       max77686 = devm_kzalloc(&i2c->dev,
+                               sizeof(struct max77686_dev), GFP_KERNEL);
        if (max77686 == NULL)
                return -ENOMEM;
 
@@ -107,7 +108,6 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
                ret = PTR_ERR(max77686->regmap);
                dev_err(max77686->dev, "Failed to allocate register map: %d\n",
                                ret);
-               kfree(max77686);
                return ret;
        }
 
@@ -115,8 +115,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
                         MAX77686_REG_DEVICE_ID, &data) < 0) {
                dev_err(max77686->dev,
                        "device not found on this channel (this is not an error)\n");
-               ret = -ENODEV;
-               goto err;
+               return -ENODEV;
        } else
                dev_info(max77686->dev, "device found\n");
 
@@ -127,17 +126,11 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
 
        ret = mfd_add_devices(max77686->dev, -1, max77686_devs,
                              ARRAY_SIZE(max77686_devs), NULL, 0, NULL);
+       if (ret < 0) {
+               mfd_remove_devices(max77686->dev);
+               i2c_unregister_device(max77686->rtc);
+       }
 
-       if (ret < 0)
-               goto err_mfd;
-
-       return ret;
-
-err_mfd:
-       mfd_remove_devices(max77686->dev);
-       i2c_unregister_device(max77686->rtc);
-err:
-       kfree(max77686);
        return ret;
 }
 
@@ -147,7 +140,6 @@ static int max77686_i2c_remove(struct i2c_client *i2c)
 
        mfd_remove_devices(max77686->dev);
        i2c_unregister_device(max77686->rtc);
-       kfree(max77686);
 
        return 0;
 }