Skip to content

Commit

Permalink
regulator: gpio-regulator: Basic devm_kzalloc() conversion
Browse files Browse the repository at this point in the history
There's some other allocations but they're not so trivial as they use
kmemdup() and kstrdup().

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Apr 4, 2012
1 parent 69d715a commit 02b5521
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/regulator/gpio-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@ static int __devinit gpio_regulator_probe(struct platform_device *pdev)
struct gpio_regulator_data *drvdata;
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) {
dev_err(&pdev->dev, "Failed to allocate device data\n");
return -ENOMEM;
Expand Down Expand Up @@ -307,7 +308,6 @@ static int __devinit gpio_regulator_probe(struct platform_device *pdev)
err_name:
kfree(drvdata->desc.name);
err:
kfree(drvdata);
return ret;
}

Expand All @@ -326,7 +326,6 @@ static int __devexit gpio_regulator_remove(struct platform_device *pdev)
gpio_free(drvdata->enable_gpio);

kfree(drvdata->desc.name);
kfree(drvdata);

return 0;
}
Expand Down

0 comments on commit 02b5521

Please sign in to comment.