gpiolib: wm8994: Convert to devm_kzalloc()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
224a1f9045
commit
f8d203c049
|
@ -249,7 +249,8 @@ static int __devinit wm8994_gpio_probe(struct platform_device *pdev)
|
||||||
struct wm8994_gpio *wm8994_gpio;
|
struct wm8994_gpio *wm8994_gpio;
|
||||||
int ret;
|
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)
|
if (wm8994_gpio == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
@ -274,20 +275,14 @@ static int __devinit wm8994_gpio_probe(struct platform_device *pdev)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
err:
|
err:
|
||||||
kfree(wm8994_gpio);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __devexit wm8994_gpio_remove(struct platform_device *pdev)
|
static int __devexit wm8994_gpio_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct wm8994_gpio *wm8994_gpio = platform_get_drvdata(pdev);
|
struct wm8994_gpio *wm8994_gpio = platform_get_drvdata(pdev);
|
||||||
int ret;
|
|
||||||
|
|
||||||
ret = gpiochip_remove(&wm8994_gpio->gpio_chip);
|
return gpiochip_remove(&wm8994_gpio->gpio_chip);
|
||||||
if (ret == 0)
|
|
||||||
kfree(wm8994_gpio);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct platform_driver wm8994_gpio_driver = {
|
static struct platform_driver wm8994_gpio_driver = {
|
||||||
|
|
Loading…
Reference in New Issue