lkml.org 
[lkml]   [2012]   [Jan]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/4] drivers/video/backlight/adp5520_bl.c: use devm_ functions
    Date
    From: Julia Lawall <Julia.Lawall@lip6.fr>

    The various devm_ functions allocate memory that is released when a driver
    detaches. This patch uses these functions for data that is allocated in
    the probe function of a platform device and is only freed in the remove
    function.

    Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

    ---
    drivers/video/backlight/adp5520_bl.c | 6 +-----
    1 file changed, 1 insertion(+), 5 deletions(-)

    diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/backlight/adp5520_bl.c
    index 2e630bf..4911ea7 100644
    --- a/drivers/video/backlight/adp5520_bl.c
    +++ b/drivers/video/backlight/adp5520_bl.c
    @@ -289,7 +289,7 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev)
    struct adp5520_bl *data;
    int ret = 0;

    - data = kzalloc(sizeof(*data), GFP_KERNEL);
    + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
    if (data == NULL)
    return -ENOMEM;

    @@ -298,7 +298,6 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev)

    if (data->pdata == NULL) {
    dev_err(&pdev->dev, "missing platform data\n");
    - kfree(data);
    return -ENODEV;
    }

    @@ -314,7 +313,6 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev)
    &adp5520_bl_ops, &props);
    if (IS_ERR(bl)) {
    dev_err(&pdev->dev, "failed to register backlight\n");
    - kfree(data);
    return PTR_ERR(bl);
    }

    @@ -326,7 +324,6 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev)
    if (ret) {
    dev_err(&pdev->dev, "failed to register sysfs\n");
    backlight_device_unregister(bl);
    - kfree(data);
    }

    platform_set_drvdata(pdev, bl);
    @@ -348,7 +345,6 @@ static int __devexit adp5520_bl_remove(struct platform_device *pdev)
    &adp5520_bl_attr_group);

    backlight_device_unregister(bl);
    - kfree(data);

    return 0;
    }


    \
     
     \ /
      Last update: 2012-01-20 22:29    [W:3.146 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site