Commit 02b55216 authored by Mark Brown's avatar Mark Brown

regulator: gpio-regulator: Basic devm_kzalloc() conversion

There's some other allocations but they're not so trivial as they use
kmemdup() and kstrdup().
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 69d715a1
...@@ -174,7 +174,8 @@ static int __devinit gpio_regulator_probe(struct platform_device *pdev) ...@@ -174,7 +174,8 @@ static int __devinit gpio_regulator_probe(struct platform_device *pdev)
struct gpio_regulator_data *drvdata; struct gpio_regulator_data *drvdata;
int ptr, ret, state; int ptr, ret, state;
drvdata = kzalloc(sizeof(struct gpio_regulator_data), GFP_KERNEL); drvdata = devm_kzalloc(&pdev->dev, sizeof(struct gpio_regulator_data),
GFP_KERNEL);
if (drvdata == NULL) { if (drvdata == NULL) {
dev_err(&pdev->dev, "Failed to allocate device data\n"); dev_err(&pdev->dev, "Failed to allocate device data\n");
return -ENOMEM; return -ENOMEM;
...@@ -307,7 +308,6 @@ static int __devinit gpio_regulator_probe(struct platform_device *pdev) ...@@ -307,7 +308,6 @@ static int __devinit gpio_regulator_probe(struct platform_device *pdev)
err_name: err_name:
kfree(drvdata->desc.name); kfree(drvdata->desc.name);
err: err:
kfree(drvdata);
return ret; return ret;
} }
...@@ -326,7 +326,6 @@ static int __devexit gpio_regulator_remove(struct platform_device *pdev) ...@@ -326,7 +326,6 @@ static int __devexit gpio_regulator_remove(struct platform_device *pdev)
gpio_free(drvdata->enable_gpio); gpio_free(drvdata->enable_gpio);
kfree(drvdata->desc.name); kfree(drvdata->desc.name);
kfree(drvdata);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment