1 files changed, 7 insertions, 11 deletions

diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index 14714058f2d2..cee098c0dae3 100644
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -51,7 +51,7 @@ static struct mfd_cell max8997_devs[] = {
 
 #ifdef CONFIG_OF
 static struct of_device_id max8997_pmic_dt_match[] = {
-        { .compatible = "maxim,max8997-pmic", .data = TYPE_MAX8997 },
+        { .compatible = "maxim,max8997-pmic", .data = (void *)TYPE_MAX8997 },
         {},
 };
 #endif
@@ -188,10 +188,11 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
 {
         struct max8997_dev *max8997;
-        struct max8997_platform_data *pdata = i2c->dev.platform_data;
+        struct max8997_platform_data *pdata = dev_get_platdata(&i2c->dev);
         int ret = 0;
 
-        max8997 = kzalloc(sizeof(struct max8997_dev), GFP_KERNEL);
+        max8997 = devm_kzalloc(&i2c->dev, sizeof(struct max8997_dev),
+                                GFP_KERNEL);
         if (max8997 == NULL)
                 return -ENOMEM;
 
@@ -203,14 +204,12 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
 
         if (max8997->dev->of_node) {
                 pdata = max8997_i2c_parse_dt_pdata(max8997->dev);
-                if (IS_ERR(pdata)) {
-                        ret = PTR_ERR(pdata);
-                        goto err;
-                }
+                if (IS_ERR(pdata))
+                        return PTR_ERR(pdata);
         }
 
         if (!pdata)
-                goto err;
+                return ret;
 
         max8997->pdata = pdata;
         max8997->ono = pdata->ono;
@@ -250,8 +249,6 @@ err_mfd:
         i2c_unregister_device(max8997->muic);
         i2c_unregister_device(max8997->haptic);
         i2c_unregister_device(max8997->rtc);
-err:
-        kfree(max8997);
         return ret;
 }
 
@@ -263,7 +260,6 @@ static int max8997_i2c_remove(struct i2c_client *i2c)
         i2c_unregister_device(max8997->muic);
         i2c_unregister_device(max8997->haptic);
         i2c_unregister_device(max8997->rtc);
-        kfree(max8997);
 
         return 0;
 }