Skip to content

Commit

Permalink
gpio: wm8350: Convert to use devm_kzalloc API
Browse files Browse the repository at this point in the history
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Axel Lin authored and Linus Walleij committed Sep 4, 2012
1 parent 718bc6e commit 5b42543
Showing 1 changed file with 5 additions and 14 deletions.
19 changes: 5 additions & 14 deletions drivers/gpio/gpio-wm8350.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ static int __devinit wm8350_gpio_probe(struct platform_device *pdev)
struct wm8350_gpio_data *wm8350_gpio;
int ret;

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

Expand All @@ -131,30 +132,20 @@ static int __devinit wm8350_gpio_probe(struct platform_device *pdev)

ret = gpiochip_add(&wm8350_gpio->gpio_chip);
if (ret < 0) {
dev_err(&pdev->dev, "Could not register gpiochip, %d\n",
ret);
goto err;
dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
return ret;
}

platform_set_drvdata(pdev, wm8350_gpio);

return ret;

err:
kfree(wm8350_gpio);
return ret;
}

static int __devexit wm8350_gpio_remove(struct platform_device *pdev)
{
struct wm8350_gpio_data *wm8350_gpio = platform_get_drvdata(pdev);
int ret;

ret = gpiochip_remove(&wm8350_gpio->gpio_chip);
if (ret == 0)
kfree(wm8350_gpio);

return ret;
return gpiochip_remove(&wm8350_gpio->gpio_chip);
}

static struct platform_driver wm8350_gpio_driver = {
Expand Down

0 comments on commit 5b42543

Please sign in to comment.