Skip to content

Commit

Permalink
gpio: wm831x: 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 c8554d3 commit 718bc6e
Showing 1 changed file with 5 additions and 14 deletions.
19 changes: 5 additions & 14 deletions drivers/gpio/gpio-wm831x.c
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,8 @@ static int __devinit wm831x_gpio_probe(struct platform_device *pdev)
struct wm831x_gpio *wm831x_gpio;
int ret;

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

Expand All @@ -265,30 +266,20 @@ static int __devinit wm831x_gpio_probe(struct platform_device *pdev)

ret = gpiochip_add(&wm831x_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, wm831x_gpio);

return ret;

err:
kfree(wm831x_gpio);
return ret;
}

static int __devexit wm831x_gpio_remove(struct platform_device *pdev)
{
struct wm831x_gpio *wm831x_gpio = platform_get_drvdata(pdev);
int ret;

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

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

static struct platform_driver wm831x_gpio_driver = {
Expand Down

0 comments on commit 718bc6e

Please sign in to comment.