Browse Source

leds: convert ADP5520 LED driver to devm_kzalloc() and cleanup error exit path

Cc: Michael Hennerich <hennerich@blackfin.uclinux.org>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Bryan Wu 13 years ago
parent
commit
bcbf01624f
1 changed files with 3 additions and 5 deletions
  1. 3 5
      drivers/leds/leds-adp5520.c

+ 3 - 5
drivers/leds/leds-adp5520.c

@@ -119,7 +119,8 @@ static int __devinit adp5520_led_probe(struct platform_device *pdev)
 		return -EFAULT;
 		return -EFAULT;
 	}
 	}
 
 
-	led = kzalloc(sizeof(*led) * pdata->num_leds, GFP_KERNEL);
+	led = devm_kzalloc(&pdev->dev, sizeof(*led) * pdata->num_leds,
+				GFP_KERNEL);
 	if (led == NULL) {
 	if (led == NULL) {
 		dev_err(&pdev->dev, "failed to alloc memory\n");
 		dev_err(&pdev->dev, "failed to alloc memory\n");
 		return -ENOMEM;
 		return -ENOMEM;
@@ -129,7 +130,7 @@ static int __devinit adp5520_led_probe(struct platform_device *pdev)
 
 
 	if (ret) {
 	if (ret) {
 		dev_err(&pdev->dev, "failed to write\n");
 		dev_err(&pdev->dev, "failed to write\n");
-		goto err_free;
+		return ret;
 	}
 	}
 
 
 	for (i = 0; i < pdata->num_leds; ++i) {
 	for (i = 0; i < pdata->num_leds; ++i) {
@@ -179,8 +180,6 @@ err:
 		}
 		}
 	}
 	}
 
 
-err_free:
-	kfree(led);
 	return ret;
 	return ret;
 }
 }
 
 
@@ -200,7 +199,6 @@ static int __devexit adp5520_led_remove(struct platform_device *pdev)
 		cancel_work_sync(&led[i].work);
 		cancel_work_sync(&led[i].work);
 	}
 	}
 
 
-	kfree(led);
 	return 0;
 	return 0;
 }
 }