lkml.org 
[lkml]   [2013]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/14] power: pcf50633-charger: use devm_kzalloc()
    Date
    Use devm_kzalloc() to make cleanup paths more simple.

    Signed-off-by: Jingoo Han <jg1.han@samsung.com>
    ---
    drivers/power/pcf50633-charger.c | 7 +------
    1 files changed, 1 insertions(+), 6 deletions(-)

    diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c
    index c2122a7..17fd77f 100644
    --- a/drivers/power/pcf50633-charger.c
    +++ b/drivers/power/pcf50633-charger.c
    @@ -373,7 +373,7 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
    int i;
    u8 mbcs1;

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

    @@ -413,7 +413,6 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
    ret = power_supply_register(&pdev->dev, &mbc->adapter);
    if (ret) {
    dev_err(mbc->pcf->dev, "failed to register adapter\n");
    - kfree(mbc);
    return ret;
    }

    @@ -421,7 +420,6 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
    if (ret) {
    dev_err(mbc->pcf->dev, "failed to register usb\n");
    power_supply_unregister(&mbc->adapter);
    - kfree(mbc);
    return ret;
    }

    @@ -430,7 +428,6 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
    dev_err(mbc->pcf->dev, "failed to register ac\n");
    power_supply_unregister(&mbc->adapter);
    power_supply_unregister(&mbc->usb);
    - kfree(mbc);
    return ret;
    }

    @@ -461,8 +458,6 @@ static int pcf50633_mbc_remove(struct platform_device *pdev)
    power_supply_unregister(&mbc->adapter);
    power_supply_unregister(&mbc->ac);

    - kfree(mbc);
    -
    return 0;
    }

    --
    1.7.2.5



    \
     
     \ /
      Last update: 2013-03-11 08:02    [W:3.360 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site