diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2014-02-20 03:53:15 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-20 06:53:58 -0500 |
| commit | 0ad91c69abed19c00dbb41f9c423fea0c64f7ef5 (patch) | |
| tree | 507ecf856fb10bd876b91c3cdd4417fec736a90e | |
| parent | 026cdfe6f8c1d6f507994814b4a725cfa5479a29 (diff) | |
regulator: tps65090: Remove redundant error message
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>
| -rw-r--r-- | drivers/regulator/tps65090-regulator.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/regulator/tps65090-regulator.c b/drivers/regulator/tps65090-regulator.c index 5674f886c471..2e92ef68574d 100644 --- a/drivers/regulator/tps65090-regulator.c +++ b/drivers/regulator/tps65090-regulator.c | |||
| @@ -168,17 +168,13 @@ static struct tps65090_platform_data *tps65090_parse_dt_reg_data( | |||
| 168 | 168 | ||
| 169 | tps65090_pdata = devm_kzalloc(&pdev->dev, sizeof(*tps65090_pdata), | 169 | tps65090_pdata = devm_kzalloc(&pdev->dev, sizeof(*tps65090_pdata), |
| 170 | GFP_KERNEL); | 170 | GFP_KERNEL); |
| 171 | if (!tps65090_pdata) { | 171 | if (!tps65090_pdata) |
| 172 | dev_err(&pdev->dev, "Memory alloc for tps65090_pdata failed\n"); | ||
| 173 | return ERR_PTR(-ENOMEM); | 172 | return ERR_PTR(-ENOMEM); |
| 174 | } | ||
| 175 | 173 | ||
| 176 | reg_pdata = devm_kzalloc(&pdev->dev, TPS65090_REGULATOR_MAX * | 174 | reg_pdata = devm_kzalloc(&pdev->dev, TPS65090_REGULATOR_MAX * |
| 177 | sizeof(*reg_pdata), GFP_KERNEL); | 175 | sizeof(*reg_pdata), GFP_KERNEL); |
| 178 | if (!reg_pdata) { | 176 | if (!reg_pdata) |
| 179 | dev_err(&pdev->dev, "Memory alloc for reg_pdata failed\n"); | ||
| 180 | return ERR_PTR(-ENOMEM); | 177 | return ERR_PTR(-ENOMEM); |
| 181 | } | ||
| 182 | 178 | ||
| 183 | regulators = of_get_child_by_name(np, "regulators"); | 179 | regulators = of_get_child_by_name(np, "regulators"); |
| 184 | if (!regulators) { | 180 | if (!regulators) { |
| @@ -253,10 +249,8 @@ static int tps65090_regulator_probe(struct platform_device *pdev) | |||
| 253 | 249 | ||
| 254 | pmic = devm_kzalloc(&pdev->dev, TPS65090_REGULATOR_MAX * sizeof(*pmic), | 250 | pmic = devm_kzalloc(&pdev->dev, TPS65090_REGULATOR_MAX * sizeof(*pmic), |
| 255 | GFP_KERNEL); | 251 | GFP_KERNEL); |
| 256 | if (!pmic) { | 252 | if (!pmic) |
| 257 | dev_err(&pdev->dev, "mem alloc for pmic failed\n"); | ||
| 258 | return -ENOMEM; | 253 | return -ENOMEM; |
| 259 | } | ||
| 260 | 254 | ||
| 261 | for (num = 0; num < TPS65090_REGULATOR_MAX; num++) { | 255 | for (num = 0; num < TPS65090_REGULATOR_MAX; num++) { |
| 262 | tps_pdata = tps65090_pdata->reg_pdata[num]; | 256 | tps_pdata = tps65090_pdata->reg_pdata[num]; |
