Skip to content

Commit

Permalink
leds: Remove duplicated OOM message for individual driver
Browse files Browse the repository at this point in the history
The OOM message of individual driver is unnecessary, and this is
duplicate the memory subsystem generic OOM message.

Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
  • Loading branch information
Xiubo Li authored and Bryan Wu committed May 8, 2014
1 parent 24c9301 commit 0c9a03b
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 18 deletions.
5 changes: 1 addition & 4 deletions drivers/leds/leds-adp5520.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,10 @@ static int adp5520_led_probe(struct platform_device *pdev)

led = devm_kzalloc(&pdev->dev, sizeof(*led) * pdata->num_leds,
GFP_KERNEL);
if (led == NULL) {
dev_err(&pdev->dev, "failed to alloc memory\n");
if (!led)
return -ENOMEM;
}

ret = adp5520_led_prepare(pdev);

if (ret) {
dev_err(&pdev->dev, "failed to write\n");
return ret;
Expand Down
4 changes: 1 addition & 3 deletions drivers/leds/leds-bd2802.c
Original file line number Diff line number Diff line change
Expand Up @@ -678,10 +678,8 @@ static int bd2802_probe(struct i2c_client *client,
int ret, i;

led = devm_kzalloc(&client->dev, sizeof(struct bd2802_led), GFP_KERNEL);
if (!led) {
dev_err(&client->dev, "failed to allocate driver data\n");
if (!led)
return -ENOMEM;
}

led->client = client;
pdata = led->pdata = dev_get_platdata(&client->dev);
Expand Down
4 changes: 1 addition & 3 deletions drivers/leds/leds-da903x.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,8 @@ static int da903x_led_probe(struct platform_device *pdev)
}

led = devm_kzalloc(&pdev->dev, sizeof(struct da903x_led), GFP_KERNEL);
if (led == NULL) {
dev_err(&pdev->dev, "failed to alloc memory for LED%d\n", id);
if (!led)
return -ENOMEM;
}

led->cdev.name = pdata->name;
led->cdev.default_trigger = pdata->default_trigger;
Expand Down
3 changes: 1 addition & 2 deletions drivers/leds/leds-da9052.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@ static int da9052_led_probe(struct platform_device *pdev)
led = devm_kzalloc(&pdev->dev,
sizeof(struct da9052_led) * pled->num_leds,
GFP_KERNEL);
if (led == NULL) {
dev_err(&pdev->dev, "Failed to alloc memory\n");
if (!led) {
error = -ENOMEM;
goto err;
}
Expand Down
4 changes: 1 addition & 3 deletions drivers/leds/leds-s3c24xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,8 @@ static int s3c24xx_led_probe(struct platform_device *dev)

led = devm_kzalloc(&dev->dev, sizeof(struct s3c24xx_gpio_led),
GFP_KERNEL);
if (led == NULL) {
dev_err(&dev->dev, "No memory for device\n");
if (!led)
return -ENOMEM;
}

platform_set_drvdata(dev, led);

Expand Down
4 changes: 1 addition & 3 deletions drivers/leds/leds-sunfire.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,8 @@ static int sunfire_led_generic_probe(struct platform_device *pdev,
}

p = devm_kzalloc(&pdev->dev, sizeof(*p), GFP_KERNEL);
if (!p) {
dev_err(&pdev->dev, "Could not allocate struct sunfire_drvdata\n");
if (!p)
return -ENOMEM;
}

for (i = 0; i < NUM_LEDS_PER_BOARD; i++) {
struct led_classdev *lp = &p->leds[i].led_cdev;
Expand Down

0 comments on commit 0c9a03b

Please sign in to comment.