diff mbox

[02/16] mfd: 88pm860x: Convert to managed resources for allocating memory

Message ID 1369322717-30429-2-git-send-email-lee.jones@linaro.org
State Accepted
Commit a1ace0aac5a83b859c2ddeb5dfb032b9b6dcd9cf
Headers show

Commit Message

Lee Jones May 23, 2013, 3:25 p.m. UTC 
---
 drivers/mfd/88pm860x-core.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index 31ca555..ef6d82c 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -1150,7 +1150,8 @@  static int pm860x_probe(struct i2c_client *client,
 		return -EINVAL;
 	}
 
-	chip = kzalloc(sizeof(struct pm860x_chip), GFP_KERNEL);
+	chip = devm_kzalloc(&client->dev,
+			    sizeof(struct pm860x_chip), GFP_KERNEL);
 	if (chip == NULL)
 		return -ENOMEM;
 
@@ -1160,7 +1161,6 @@  static int pm860x_probe(struct i2c_client *client,
 		ret = PTR_ERR(chip->regmap);
 		dev_err(&client->dev, "Failed to allocate register map: %d\n",
 				ret);
-		kfree(chip);
 		return ret;
 	}
 	chip->client = client;
@@ -1204,7 +1204,6 @@  static int pm860x_remove(struct i2c_client *client)
 		i2c_unregister_device(chip->companion);
 	}
 	regmap_exit(chip->regmap);
-	kfree(chip);
 	return 0;
 }