xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regulator: tps65090: Remove redundant error message

Browse Source 
kzalloc prints its own OOM message upon failure.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Sachin Kamat
2014-02-20 14:23:15 +05:30
committed by Mark Brown
parent 026cdfe6f8
commit 0ad91c69ab
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/regulator/tps65090-regulator.c
View File

@@ -168,17 +168,13 @@ static struct tps65090_platform_data *tps65090_parse_dt_reg_data(
tps65090_pdata = devm_kzalloc(&pdev->dev, sizeof(*tps65090_pdata), tps65090_pdata = devm_kzalloc(&pdev->dev, sizeof(*tps65090_pdata),
GFP_KERNEL); GFP_KERNEL);
if (!tps65090_pdata) { if (!tps65090_pdata)
dev_err(&pdev->dev, "Memory alloc for tps65090_pdata failed\n");
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
}
reg_pdata = devm_kzalloc(&pdev->dev, TPS65090_REGULATOR_MAX * reg_pdata = devm_kzalloc(&pdev->dev, TPS65090_REGULATOR_MAX *
sizeof(*reg_pdata), GFP_KERNEL); sizeof(*reg_pdata), GFP_KERNEL);
if (!reg_pdata) { if (!reg_pdata)
dev_err(&pdev->dev, "Memory alloc for reg_pdata failed\n");
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
}
regulators = of_get_child_by_name(np, "regulators"); regulators = of_get_child_by_name(np, "regulators");
if (!regulators) { if (!regulators) {
@@ -253,10 +249,8 @@ static int tps65090_regulator_probe(struct platform_device *pdev)
pmic = devm_kzalloc(&pdev->dev, TPS65090_REGULATOR_MAX * sizeof(*pmic), pmic = devm_kzalloc(&pdev->dev, TPS65090_REGULATOR_MAX * sizeof(*pmic),
GFP_KERNEL); GFP_KERNEL);
if (!pmic) { if (!pmic)
dev_err(&pdev->dev, "mem alloc for pmic failed\n");
return -ENOMEM; return -ENOMEM;
}
for (num = 0; num < TPS65090_REGULATOR_MAX; num++) { for (num = 0; num < TPS65090_REGULATOR_MAX; num++) {
tps_pdata = tps65090_pdata->reg_pdata[num]; tps_pdata = tps65090_pdata->reg_pdata[num];