diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2014-02-20 09:53:13 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-20 12:51:08 +0100 |
| commit | 33e63ba6c698740bebc49dc9a7e652526ca005cc (patch) | |
| tree | 7b5e427607eed5fdd80667953b466734be1d3eff /drivers | |
| parent | Linus 3.14-rc1 (diff) | |
| download | linux-33e63ba6c698740bebc49dc9a7e652526ca005cc.tar.xz linux-33e63ba6c698740bebc49dc9a7e652526ca005cc.zip | |
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')
| -rw-r--r-- | drivers/regulator/tps62360-regulator.c | 9 |
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 * 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) { @@ -377,11 +375,8 @@ static int tps62360_probe(struct i2c_client *client, } tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL); - if (!tps) { - dev_err(&client->dev, "%s(): Memory allocation failed\n", - __func__); + if (!tps) return -ENOMEM; - } tps->en_discharge = pdata->en_discharge; tps->en_internal_pulldn = pdata->en_internal_pulldn; |