leds-88pm860x: use devm_kzalloc function
authorDevendra Naga <devendra.aaru@gmail.com>
Mon, 2 Jul 2012 10:15:43 +0000 (18:15 +0800)
committerBryan Wu <bryan.wu@canonical.com>
Mon, 23 Jul 2012 23:52:35 +0000 (07:52 +0800)
Using devm_kzalloc will remove all the error checks and the frees are automatically done at the driver unload side.

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
drivers/leds/leds-88pm860x.c

index 5b61aaf7ac0f3faa565430fd1acafef8162afd20..61897cfeeda6ed76bbd012a385a7a7c5a0656f4a 100644 (file)
@@ -209,7 +209,7 @@ static int pm860x_led_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       data = kzalloc(sizeof(struct pm860x_led), GFP_KERNEL);
+       data = devm_kzalloc(&pdev->dev, sizeof(struct pm860x_led), GFP_KERNEL);
        if (data == NULL)
                return -ENOMEM;
        strncpy(data->name, res->name, MFD_NAME_SIZE - 1);
@@ -220,7 +220,6 @@ static int pm860x_led_probe(struct platform_device *pdev)
        data->port = pdata->flags;
        if (data->port < 0) {
                dev_err(&pdev->dev, "check device failed\n");
-               kfree(data);
                return -EINVAL;
        }
 
@@ -233,13 +232,10 @@ static int pm860x_led_probe(struct platform_device *pdev)
        ret = led_classdev_register(chip->dev, &data->cdev);
        if (ret < 0) {
                dev_err(&pdev->dev, "Failed to register LED: %d\n", ret);
-               goto out;
+               return ret;
        }
        pm860x_led_set(&data->cdev, 0);
        return 0;
-out:
-       kfree(data);
-       return ret;
 }
 
 static int pm860x_led_remove(struct platform_device *pdev)
@@ -247,7 +243,6 @@ static int pm860x_led_remove(struct platform_device *pdev)
        struct pm860x_led *data = platform_get_drvdata(pdev);
 
        led_classdev_unregister(&data->cdev);
-       kfree(data);
 
        return 0;
 }