Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 13:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

regulator: tps65910: use devm_* for memory allocation

Browse Source 
use the devm_* apis for memory allocation.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Laxman Dewangan 2012-05-19 20:04:09 +05:30 committed by Mark Brown
parent 33a6943d2c
commit 68d8c1cd51
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/regulator/tps65910-regulator.c
View File

@ -1183,25 +1183,25 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
return -ENODEV;
}
pmic->desc = kcalloc(pmic->num_regulators,
pmic->desc = devm_kzalloc(&pdev->dev, pmic->num_regulators *
sizeof(struct regulator_desc), GFP_KERNEL);
if (!pmic->desc) {
err = -ENOMEM;
goto err_out;
dev_err(&pdev->dev, "Memory alloc fails for desc\n");
return -ENOMEM;
}
pmic->info = kcalloc(pmic->num_regulators,
pmic->info = devm_kzalloc(&pdev->dev, pmic->num_regulators *
sizeof(struct tps_info *), GFP_KERNEL);
if (!pmic->info) {
err = -ENOMEM;
goto err_free_desc;
dev_err(&pdev->dev, "Memory alloc fails for info\n");
return -ENOMEM;
}
pmic->rdev = kcalloc(pmic->num_regulators,
pmic->rdev = devm_kzalloc(&pdev->dev, pmic->num_regulators *
sizeof(struct regulator_dev *), GFP_KERNEL);
if (!pmic->rdev) {
err = -ENOMEM;
goto err_free_info;
dev_err(&pdev->dev, "Memory alloc fails for rdev\n");
return -ENOMEM;
}
for (i = 0; i < pmic->num_regulators && i < TPS65910_NUM_REGS;
@ -1279,12 +1279,6 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
err_unregister_regulator:
while (--i >= 0)
regulator_unregister(pmic->rdev[i]);
kfree(pmic->rdev);
err_free_info:
kfree(pmic->info);
err_free_desc:
kfree(pmic->desc);
err_out:
return err;
}
@ -1296,9 +1290,6 @@ static int __devexit tps65910_remove(struct platform_device *pdev)
for (i = 0; i < pmic->num_regulators; i++)
regulator_unregister(pmic->rdev[i]);
kfree(pmic->rdev);
kfree(pmic->info);
kfree(pmic->desc);
return 0;
}