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 2/4] gpiolib: wm8994: Convert to devm_kzalloc()
    Date
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Acked-by: Linus Walleij <linus.walleij@linaro.org>
    ---
    drivers/gpio/gpio-wm8994.c | 11 +++--------
    1 file changed, 3 insertions(+), 8 deletions(-)

    diff --git a/drivers/gpio/gpio-wm8994.c b/drivers/gpio/gpio-wm8994.c
    index a1c7ba9..f2b3d19 100644
    --- a/drivers/gpio/gpio-wm8994.c
    +++ b/drivers/gpio/gpio-wm8994.c
    @@ -249,7 +249,8 @@ static int __devinit wm8994_gpio_probe(struct platform_device *pdev)
    struct wm8994_gpio *wm8994_gpio;
    int ret;

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

    @@ -274,20 +275,14 @@ static int __devinit wm8994_gpio_probe(struct platform_device *pdev)
    return ret;

    err:
    - kfree(wm8994_gpio);
    return ret;
    }

    static int __devexit wm8994_gpio_remove(struct platform_device *pdev)
    {
    struct wm8994_gpio *wm8994_gpio = platform_get_drvdata(pdev);
    - int ret;
    -
    - ret = gpiochip_remove(&wm8994_gpio->gpio_chip);
    - if (ret == 0)
    - kfree(wm8994_gpio);

    - return ret;
    + return gpiochip_remove(&wm8994_gpio->gpio_chip);
    }

    static struct platform_driver wm8994_gpio_driver = {
    --
    1.7.10


    \
     
     \ /
      Last update: 2012-07-04 19:01    [W:0.022 / U:4.132 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site