summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2014-02-20 14:23:12 +0530
committerMark Brown <broonie@linaro.org>2014-02-20 20:50:01 +0900
commitef4bcf88ea90f350dc09f8d3055e03832f7a175d (patch)
tree3d809eb1ddd218fd298c4c6f8c8d5c0ac145399c /drivers/regulator
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
downloadlinux-ef4bcf88ea90f350dc09f8d3055e03832f7a175d.tar.gz
linux-ef4bcf88ea90f350dc09f8d3055e03832f7a175d.tar.bz2
linux-ef4bcf88ea90f350dc09f8d3055e03832f7a175d.zip
regulator: tps51632: 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')
-rw-r--r--drivers/regulator/tps51632-regulator.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/regulator/tps51632-regulator.c b/drivers/regulator/tps51632-regulator.c
index b3764f594ee9..f31f22e3e1bd 100644
--- a/drivers/regulator/tps51632-regulator.c
+++ b/drivers/regulator/tps51632-regulator.c
@@ -227,10 +227,8 @@ static struct tps51632_regulator_platform_data *
struct device_node *np = dev->of_node;
pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
- if (!pdata) {
- dev_err(dev, "Memory alloc failed for platform data\n");
+ if (!pdata)
return NULL;
- }
pdata->reg_init_data = of_get_regulator_init_data(dev, dev->of_node);
if (!pdata->reg_init_data) {
@@ -299,10 +297,8 @@ static int tps51632_probe(struct i2c_client *client,
}
tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);
- if (!tps) {
- dev_err(&client->dev, "Memory allocation failed\n");
+ if (!tps)
return -ENOMEM;
- }
tps->dev = &client->dev;
tps->desc.name = client->name;