Skip to content

Commit

Permalink
regulator: bcm590xx: remove unnecessary OOM messages
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jingoo Han authored and Mark Brown committed Jun 6, 2014
1 parent c9eaa44 commit c969faa
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions drivers/regulator/bcm590xx-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,8 @@ static struct bcm590xx_board *bcm590xx_parse_dt_reg_data(
}

data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
if (!data) {
dev_err(&pdev->dev, "failed to allocate regulator board data\n");
if (!data)
return NULL;
}

np = of_node_get(np);
regulators = of_get_child_by_name(np, "regulators");
Expand Down Expand Up @@ -311,28 +309,22 @@ static int bcm590xx_probe(struct platform_device *pdev)
&bcm590xx_reg_matches);

pmu = devm_kzalloc(&pdev->dev, sizeof(*pmu), GFP_KERNEL);
if (!pmu) {
dev_err(&pdev->dev, "Memory allocation failed for pmu\n");
if (!pmu)
return -ENOMEM;
}

pmu->mfd = bcm590xx;

platform_set_drvdata(pdev, pmu);

pmu->desc = devm_kzalloc(&pdev->dev, BCM590XX_NUM_REGS *
sizeof(struct regulator_desc), GFP_KERNEL);
if (!pmu->desc) {
dev_err(&pdev->dev, "Memory alloc fails for desc\n");
if (!pmu->desc)
return -ENOMEM;
}

pmu->info = devm_kzalloc(&pdev->dev, BCM590XX_NUM_REGS *
sizeof(struct bcm590xx_info *), GFP_KERNEL);
if (!pmu->info) {
dev_err(&pdev->dev, "Memory alloc fails for info\n");
if (!pmu->info)
return -ENOMEM;
}

info = bcm590xx_regs;

Expand Down

0 comments on commit c969faa

Please sign in to comment.