Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 718bc6e3 authored by Axel Lin's avatar Axel Lin Committed by Linus Walleij
Browse files

gpio: wm831x: Convert to use devm_kzalloc API 



Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c8554d32

drivers/gpio/gpio-wm831x.c

+5 −14
Original line number Diff line number Diff line
@@ -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;
@@ -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 = {