diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2014-02-20 03:53:17 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-20 06:57:06 -0500 |
commit | 02e905845fb722be50d605bdcb277bad6a6bfe66 (patch) | |
tree | f59c0353a3bfba5ef0bc70d87d0c08b6174e5268 | |
parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (diff) |
regulator: tps6586x: 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/tps6586x-regulator.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c index 0485d47f0d8a..e36f3569767f 100644 --- a/drivers/regulator/tps6586x-regulator.c +++ b/drivers/regulator/tps6586x-regulator.c | |||
@@ -363,10 +363,8 @@ static struct tps6586x_platform_data *tps6586x_parse_regulator_dt( | |||
363 | } | 363 | } |
364 | 364 | ||
365 | pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); | 365 | pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); |
366 | if (!pdata) { | 366 | if (!pdata) |
367 | dev_err(&pdev->dev, "Memory alloction failed\n"); | ||
368 | return NULL; | 367 | return NULL; |
369 | } | ||
370 | 368 | ||
371 | for (i = 0; i < num; i++) { | 369 | for (i = 0; i < num; i++) { |
372 | int id; | 370 | int id; |
@@ -420,10 +418,8 @@ static int tps6586x_regulator_probe(struct platform_device *pdev) | |||
420 | 418 | ||
421 | rdev = devm_kzalloc(&pdev->dev, TPS6586X_ID_MAX_REGULATOR * | 419 | rdev = devm_kzalloc(&pdev->dev, TPS6586X_ID_MAX_REGULATOR * |
422 | sizeof(*rdev), GFP_KERNEL); | 420 | sizeof(*rdev), GFP_KERNEL); |
423 | if (!rdev) { | 421 | if (!rdev) |
424 | dev_err(&pdev->dev, "Mmemory alloc failed\n"); | ||
425 | return -ENOMEM; | 422 | return -ENOMEM; |
426 | } | ||
427 | 423 | ||
428 | version = tps6586x_get_version(pdev->dev.parent); | 424 | version = tps6586x_get_version(pdev->dev.parent); |
429 | 425 | ||