]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
regulator: tps65090: Remove redundant error message
authorSachin Kamat <sachin.kamat@linaro.org>
Thu, 20 Feb 2014 08:53:15 +0000 (14:23 +0530)
committerMark Brown <broonie@linaro.org>
Thu, 20 Feb 2014 11:53:58 +0000 (20:53 +0900)
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>
drivers/regulator/tps65090-regulator.c

index 5674f886c47188332fbb4f5b35a242637ef09915..2e92ef68574da733e6fd81d3aed1760e627d5bc4 100644 (file)
@@ -168,17 +168,13 @@ static struct tps65090_platform_data *tps65090_parse_dt_reg_data(
 
        tps65090_pdata = devm_kzalloc(&pdev->dev, sizeof(*tps65090_pdata),
                                GFP_KERNEL);
-       if (!tps65090_pdata) {
-               dev_err(&pdev->dev, "Memory alloc for tps65090_pdata failed\n");
+       if (!tps65090_pdata)
                return ERR_PTR(-ENOMEM);
-       }
 
        reg_pdata = devm_kzalloc(&pdev->dev, TPS65090_REGULATOR_MAX *
                                sizeof(*reg_pdata), GFP_KERNEL);
-       if (!reg_pdata) {
-               dev_err(&pdev->dev, "Memory alloc for reg_pdata failed\n");
+       if (!reg_pdata)
                return ERR_PTR(-ENOMEM);
-       }
 
        regulators = of_get_child_by_name(np, "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),
                        GFP_KERNEL);
-       if (!pmic) {
-               dev_err(&pdev->dev, "mem alloc for pmic failed\n");
+       if (!pmic)
                return -ENOMEM;
-       }
 
        for (num = 0; num < TPS65090_REGULATOR_MAX; num++) {
                tps_pdata = tps65090_pdata->reg_pdata[num];