aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/tps62360-regulator.c
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2014-02-20 03:53:13 -0500
committerMark Brown <broonie@linaro.org>2014-02-20 06:51:08 -0500
commit33e63ba6c698740bebc49dc9a7e652526ca005cc (patch)
tree7b5e427607eed5fdd80667953b466734be1d3eff /drivers/regulator/tps62360-regulator.c
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
regulator: tps62360: 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>
Diffstat (limited to 'drivers/regulator/tps62360-regulator.c')
-rw-r--r--drivers/regulator/tps62360-regulator.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/regulator/tps62360-regulator.c b/drivers/regulator/tps62360-regulator.c
index c3fa15a299b1..a1672044e519 100644
--- a/drivers/regulator/tps62360-regulator.c
+++ b/drivers/regulator/tps62360-regulator.c
@@ -299,10 +299,8 @@ static struct tps62360_regulator_platform_data *
299 struct device_node *np = dev->of_node; 299 struct device_node *np = dev->of_node;
300 300
301 pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); 301 pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
302 if (!pdata) { 302 if (!pdata)
303 dev_err(dev, "Memory alloc failed for platform data\n");
304 return NULL; 303 return NULL;
305 }
306 304
307 pdata->reg_init_data = of_get_regulator_init_data(dev, dev->of_node); 305 pdata->reg_init_data = of_get_regulator_init_data(dev, dev->of_node);
308 if (!pdata->reg_init_data) { 306 if (!pdata->reg_init_data) {
@@ -377,11 +375,8 @@ static int tps62360_probe(struct i2c_client *client,
377 } 375 }
378 376
379 tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL); 377 tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);
380 if (!tps) { 378 if (!tps)
381 dev_err(&client->dev, "%s(): Memory allocation failed\n",
382 __func__);
383 return -ENOMEM; 379 return -ENOMEM;
384 }
385 380
386 tps->en_discharge = pdata->en_discharge; 381 tps->en_discharge = pdata->en_discharge;
387 tps->en_internal_pulldn = pdata->en_internal_pulldn; 382 tps->en_internal_pulldn = pdata->en_internal_pulldn;