diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2014-06-02 02:27:21 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-06 06:08:35 -0400 |
| commit | c969faadf02076641a81197f2e8641c40d232edd (patch) | |
| tree | 2fbe17136afb8936b65da406c1d4e39047038b40 /drivers/regulator/bcm590xx-regulator.c | |
| parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) | |
regulator: bcm590xx: remove unnecessary OOM messages
The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator/bcm590xx-regulator.c')
| -rw-r--r-- | drivers/regulator/bcm590xx-regulator.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/regulator/bcm590xx-regulator.c b/drivers/regulator/bcm590xx-regulator.c index c3750c5b382b..6ac27701ff83 100644 --- a/drivers/regulator/bcm590xx-regulator.c +++ b/drivers/regulator/bcm590xx-regulator.c | |||
| @@ -263,10 +263,8 @@ static struct bcm590xx_board *bcm590xx_parse_dt_reg_data( | |||
| 263 | } | 263 | } |
| 264 | 264 | ||
| 265 | data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); | 265 | data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); |
| 266 | if (!data) { | 266 | if (!data) |
| 267 | dev_err(&pdev->dev, "failed to allocate regulator board data\n"); | ||
| 268 | return NULL; | 267 | return NULL; |
| 269 | } | ||
| 270 | 268 | ||
| 271 | np = of_node_get(np); | 269 | np = of_node_get(np); |
| 272 | regulators = of_get_child_by_name(np, "regulators"); | 270 | regulators = of_get_child_by_name(np, "regulators"); |
| @@ -311,10 +309,8 @@ static int bcm590xx_probe(struct platform_device *pdev) | |||
| 311 | &bcm590xx_reg_matches); | 309 | &bcm590xx_reg_matches); |
| 312 | 310 | ||
| 313 | pmu = devm_kzalloc(&pdev->dev, sizeof(*pmu), GFP_KERNEL); | 311 | pmu = devm_kzalloc(&pdev->dev, sizeof(*pmu), GFP_KERNEL); |
| 314 | if (!pmu) { | 312 | if (!pmu) |
| 315 | dev_err(&pdev->dev, "Memory allocation failed for pmu\n"); | ||
| 316 | return -ENOMEM; | 313 | return -ENOMEM; |
| 317 | } | ||
| 318 | 314 | ||
| 319 | pmu->mfd = bcm590xx; | 315 | pmu->mfd = bcm590xx; |
| 320 | 316 | ||
| @@ -322,17 +318,13 @@ static int bcm590xx_probe(struct platform_device *pdev) | |||
| 322 | 318 | ||
| 323 | pmu->desc = devm_kzalloc(&pdev->dev, BCM590XX_NUM_REGS * | 319 | pmu->desc = devm_kzalloc(&pdev->dev, BCM590XX_NUM_REGS * |
| 324 | sizeof(struct regulator_desc), GFP_KERNEL); | 320 | sizeof(struct regulator_desc), GFP_KERNEL); |
| 325 | if (!pmu->desc) { | 321 | if (!pmu->desc) |
| 326 | dev_err(&pdev->dev, "Memory alloc fails for desc\n"); | ||
| 327 | return -ENOMEM; | 322 | return -ENOMEM; |
| 328 | } | ||
| 329 | 323 | ||
| 330 | pmu->info = devm_kzalloc(&pdev->dev, BCM590XX_NUM_REGS * | 324 | pmu->info = devm_kzalloc(&pdev->dev, BCM590XX_NUM_REGS * |
| 331 | sizeof(struct bcm590xx_info *), GFP_KERNEL); | 325 | sizeof(struct bcm590xx_info *), GFP_KERNEL); |
| 332 | if (!pmu->info) { | 326 | if (!pmu->info) |
| 333 | dev_err(&pdev->dev, "Memory alloc fails for info\n"); | ||
| 334 | return -ENOMEM; | 327 | return -ENOMEM; |
| 335 | } | ||
| 336 | 328 | ||
| 337 | info = bcm590xx_regs; | 329 | info = bcm590xx_regs; |
| 338 | 330 | ||