Commit 033f2752 authored by Linus Walleij's avatar Linus Walleij

gpio: tc3589x: use managed resources

Grab state container and irq using the devm_* functions and save
some lines of hairy clean-up code.
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1c8732bb
...@@ -329,7 +329,8 @@ static int tc3589x_gpio_probe(struct platform_device *pdev) ...@@ -329,7 +329,8 @@ static int tc3589x_gpio_probe(struct platform_device *pdev)
if (irq < 0) if (irq < 0)
return irq; return irq;
tc3589x_gpio = kzalloc(sizeof(struct tc3589x_gpio), GFP_KERNEL); tc3589x_gpio = devm_kzalloc(&pdev->dev, sizeof(struct tc3589x_gpio),
GFP_KERNEL);
if (!tc3589x_gpio) if (!tc3589x_gpio)
return -ENOMEM; return -ENOMEM;
...@@ -354,23 +355,25 @@ static int tc3589x_gpio_probe(struct platform_device *pdev) ...@@ -354,23 +355,25 @@ static int tc3589x_gpio_probe(struct platform_device *pdev)
ret = tc3589x_set_bits(tc3589x, TC3589x_RSTCTRL, ret = tc3589x_set_bits(tc3589x, TC3589x_RSTCTRL,
TC3589x_RSTCTRL_GPIRST, 0); TC3589x_RSTCTRL_GPIRST, 0);
if (ret < 0) if (ret < 0)
goto out_free; return ret;
ret = tc3589x_gpio_irq_init(tc3589x_gpio, np); ret = tc3589x_gpio_irq_init(tc3589x_gpio, np);
if (ret) if (ret)
goto out_free; return ret;
ret = request_threaded_irq(irq, NULL, tc3589x_gpio_irq, IRQF_ONESHOT, ret = devm_request_threaded_irq(&pdev->dev,
"tc3589x-gpio", tc3589x_gpio); irq, NULL, tc3589x_gpio_irq,
IRQF_ONESHOT, "tc3589x-gpio",
tc3589x_gpio);
if (ret) { if (ret) {
dev_err(&pdev->dev, "unable to get irq: %d\n", ret); dev_err(&pdev->dev, "unable to get irq: %d\n", ret);
goto out_free; return ret;
} }
ret = gpiochip_add(&tc3589x_gpio->chip); ret = gpiochip_add(&tc3589x_gpio->chip);
if (ret) { if (ret) {
dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret); dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret);
goto out_freeirq; return ret;
} }
if (pdata && pdata->setup) if (pdata && pdata->setup)
...@@ -379,12 +382,6 @@ static int tc3589x_gpio_probe(struct platform_device *pdev) ...@@ -379,12 +382,6 @@ static int tc3589x_gpio_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, tc3589x_gpio); platform_set_drvdata(pdev, tc3589x_gpio);
return 0; return 0;
out_freeirq:
free_irq(irq, tc3589x_gpio);
out_free:
kfree(tc3589x_gpio);
return ret;
} }
static int tc3589x_gpio_remove(struct platform_device *pdev) static int tc3589x_gpio_remove(struct platform_device *pdev)
...@@ -392,7 +389,6 @@ static int tc3589x_gpio_remove(struct platform_device *pdev) ...@@ -392,7 +389,6 @@ static int tc3589x_gpio_remove(struct platform_device *pdev)
struct tc3589x_gpio *tc3589x_gpio = platform_get_drvdata(pdev); struct tc3589x_gpio *tc3589x_gpio = platform_get_drvdata(pdev);
struct tc3589x *tc3589x = tc3589x_gpio->tc3589x; struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
struct tc3589x_gpio_platform_data *pdata = tc3589x->pdata->gpio; struct tc3589x_gpio_platform_data *pdata = tc3589x->pdata->gpio;
int irq = platform_get_irq(pdev, 0);
int ret; int ret;
if (pdata && pdata->remove) if (pdata && pdata->remove)
...@@ -405,10 +401,6 @@ static int tc3589x_gpio_remove(struct platform_device *pdev) ...@@ -405,10 +401,6 @@ static int tc3589x_gpio_remove(struct platform_device *pdev)
return ret; return ret;
} }
free_irq(irq, tc3589x_gpio);
kfree(tc3589x_gpio);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment