lkml.org 
[lkml]   [2012]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/25] leds: convert DA9030/DA9034 LED driver to devm_kzalloc() and cleanup error exit path
    Date
    Cc: Eric Miao <eric.miao@canonical.com>
    Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
    ---
    drivers/leds/leds-da903x.c | 9 ++-------
    1 file changed, 2 insertions(+), 7 deletions(-)

    diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c
    index d9cd73e..cc77c9d 100644
    --- a/drivers/leds/leds-da903x.c
    +++ b/drivers/leds/leds-da903x.c
    @@ -108,7 +108,7 @@ static int __devinit da903x_led_probe(struct platform_device *pdev)
    return -EINVAL;
    }

    - led = kzalloc(sizeof(struct da903x_led), GFP_KERNEL);
    + 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);
    return -ENOMEM;
    @@ -129,15 +129,11 @@ static int __devinit da903x_led_probe(struct platform_device *pdev)
    ret = led_classdev_register(led->master, &led->cdev);
    if (ret) {
    dev_err(&pdev->dev, "failed to register LED %d\n", id);
    - goto err;
    + return ret;
    }

    platform_set_drvdata(pdev, led);
    return 0;
    -
    -err:
    - kfree(led);
    - return ret;
    }

    static int __devexit da903x_led_remove(struct platform_device *pdev)
    @@ -145,7 +141,6 @@ static int __devexit da903x_led_remove(struct platform_device *pdev)
    struct da903x_led *led = platform_get_drvdata(pdev);

    led_classdev_unregister(&led->cdev);
    - kfree(led);
    return 0;
    }

    --
    1.7.10.4


    \
     
     \ /
      Last update: 2012-07-04 08:01    [W:3.299 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site