Skip to content

Commit

Permalink
regulator: mc13783: Convert to devm_kzalloc()
Browse files Browse the repository at this point in the history
Convert mc13783-regulator driver to use devm_kzalloc().

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Fabio Estevam authored and Mark Brown committed Dec 29, 2011
1 parent 32c78de commit cbe10a3
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/regulator/mc13783-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev)

dev_dbg(&pdev->dev, "%s id %d\n", __func__, pdev->id);

priv = kzalloc(sizeof(*priv) +
priv = devm_kzalloc(&pdev->dev, sizeof(*priv) +
pdata->num_regulators * sizeof(priv->regulators[0]),
GFP_KERNEL);
if (!priv)
Expand Down Expand Up @@ -374,8 +374,6 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev)
while (--i >= 0)
regulator_unregister(priv->regulators[i]);

kfree(priv);

return ret;
}

Expand All @@ -391,7 +389,6 @@ static int __devexit mc13783_regulator_remove(struct platform_device *pdev)
for (i = 0; i < pdata->num_regulators; i++)
regulator_unregister(priv->regulators[i]);

kfree(priv);
return 0;
}

Expand Down

0 comments on commit cbe10a3

Please sign in to comment.