openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mfd: 88pm860x: Drop devm_kfree of devm_kzalloc'd data 

devm_kfree() allocates memory that is released when a driver detaches.
Thus, there is no reason to explicitly call devm_kfree() in probe or remove
functions.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Jingoo Han 2013-02-20 18:27:21 +09:00 committed by Samuel Ortiz
parent c6cc25fda5
commit 85529575b6
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mfd/88pm860x-core.c
View File

@ -1144,17 +1144,15 @@ static int pm860x_probe(struct i2c_client *client,
return -ENOMEM; return -ENOMEM;
ret = pm860x_dt_init(node, &client->dev, pdata); ret = pm860x_dt_init(node, &client->dev, pdata);
if (ret) if (ret)
goto err; return ret;
} else if (!pdata) { } else if (!pdata) {
pr_info("No platform data in %s!\n", __func__); pr_info("No platform data in %s!\n", __func__);
return -EINVAL; return -EINVAL;
} }
chip = kzalloc(sizeof(struct pm860x_chip), GFP_KERNEL); chip = kzalloc(sizeof(struct pm860x_chip), GFP_KERNEL);
if (chip == NULL) { if (chip == NULL)
ret = -ENOMEM; return -ENOMEM;
goto err;
}
chip->id = verify_addr(client); chip->id = verify_addr(client);
chip->regmap = regmap_init_i2c(client, &pm860x_regmap_config); chip->regmap = regmap_init_i2c(client, &pm860x_regmap_config);
@ -1194,10 +1192,6 @@ static int pm860x_probe(struct i2c_client *client,
pm860x_device_init(chip, pdata); pm860x_device_init(chip, pdata);
return 0; return 0;
err:
if (node)
devm_kfree(&client->dev, pdata);
return ret;
} }
static int pm860x_remove(struct i2c_client *client) static int pm860x_remove(struct i2c_client *client)