From 9239a86f0976b58d3da7a2261ed659ac9eba0f25 Mon Sep 17 00:00:00 2001 From: Phil Reid Date: Mon, 25 Jul 2016 10:42:57 +0800 Subject: power: sbs-battery: Use devm_kzalloc to alloc data Use devm_kzalloc to allow memory to be freed automatically on driver probe failure or removal. Signed-off-by: Phil Reid Signed-off-by: Sebastian Reichel --- drivers/power/supply/sbs-battery.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'drivers/power') diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c index 768b9fc..20f3be6 100644 --- a/drivers/power/supply/sbs-battery.c +++ b/drivers/power/supply/sbs-battery.c @@ -819,7 +819,7 @@ static int sbs_probe(struct i2c_client *client, if (!sbs_desc->name) return -ENOMEM; - chip = kzalloc(sizeof(struct sbs_info), GFP_KERNEL); + chip = devm_kzalloc(&client->dev, sizeof(struct sbs_info), GFP_KERNEL); if (!chip) return -ENOMEM; @@ -920,8 +920,6 @@ exit_psupply: if (chip->gpio_detect) gpio_free(pdata->battery_detect); - kfree(chip); - return rc; } @@ -938,9 +936,6 @@ static int sbs_remove(struct i2c_client *client) cancel_delayed_work_sync(&chip->work); - kfree(chip); - chip = NULL; - return 0; } -- cgit v1.1