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 08/14] power: isp1704_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/isp1704_charger.c | 5 +----
    1 files changed, 1 insertions(+), 4 deletions(-)

    diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
    index 176ad59..fc04d19 100644
    --- a/drivers/power/isp1704_charger.c
    +++ b/drivers/power/isp1704_charger.c
    @@ -411,7 +411,7 @@ static int isp1704_charger_probe(struct platform_device *pdev)
    struct isp1704_charger *isp;
    int ret = -ENODEV;

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

    @@ -477,8 +477,6 @@ fail1:
    isp1704_charger_set_power(isp, 0);
    usb_put_phy(isp->phy);
    fail0:
    - kfree(isp);
    -
    dev_err(&pdev->dev, "failed to register isp1704 with error %d\n", ret);

    return ret;
    @@ -492,7 +490,6 @@ static int isp1704_charger_remove(struct platform_device *pdev)
    power_supply_unregister(&isp->psy);
    usb_put_phy(isp->phy);
    isp1704_charger_set_power(isp, 0);
    - kfree(isp);

    return 0;
    }
    --
    1.7.2.5



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