Commit 97147911 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Bartosz Golaszewski

gpio: twl4030: Reorder functions which allows to drop a forward declaraion

There is no cyclic dependency between gpio_twl4030_probe() and
gpio_twl4030_remove(), so by moving the latter before the former the
forward declaration can be dropped.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
parent 8b10ca2f
...@@ -465,8 +465,6 @@ static int gpio_twl4030_debounce(u32 debounce, u8 mmc_cd) ...@@ -465,8 +465,6 @@ static int gpio_twl4030_debounce(u32 debounce, u8 mmc_cd)
REG_GPIO_DEBEN1, 3); REG_GPIO_DEBEN1, 3);
} }
static int gpio_twl4030_remove(struct platform_device *pdev);
static struct twl4030_gpio_platform_data *of_gpio_twl4030(struct device *dev, static struct twl4030_gpio_platform_data *of_gpio_twl4030(struct device *dev,
struct twl4030_gpio_platform_data *pdata) struct twl4030_gpio_platform_data *pdata)
{ {
...@@ -494,6 +492,18 @@ static struct twl4030_gpio_platform_data *of_gpio_twl4030(struct device *dev, ...@@ -494,6 +492,18 @@ static struct twl4030_gpio_platform_data *of_gpio_twl4030(struct device *dev,
return omap_twl_info; return omap_twl_info;
} }
/* Cannot use as gpio_twl4030_probe() calls us */
static int gpio_twl4030_remove(struct platform_device *pdev)
{
struct gpio_twl4030_priv *priv = platform_get_drvdata(pdev);
gpiochip_remove(&priv->gpio_chip);
/* REVISIT no support yet for deregistering all the IRQs */
WARN_ON(!is_module());
return 0;
}
static int gpio_twl4030_probe(struct platform_device *pdev) static int gpio_twl4030_probe(struct platform_device *pdev)
{ {
struct twl4030_gpio_platform_data *pdata = dev_get_platdata(&pdev->dev); struct twl4030_gpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
...@@ -590,18 +600,6 @@ static int gpio_twl4030_probe(struct platform_device *pdev) ...@@ -590,18 +600,6 @@ static int gpio_twl4030_probe(struct platform_device *pdev)
return ret; return ret;
} }
/* Cannot use as gpio_twl4030_probe() calls us */
static int gpio_twl4030_remove(struct platform_device *pdev)
{
struct gpio_twl4030_priv *priv = platform_get_drvdata(pdev);
gpiochip_remove(&priv->gpio_chip);
/* REVISIT no support yet for deregistering all the IRQs */
WARN_ON(!is_module());
return 0;
}
static const struct of_device_id twl_gpio_match[] = { static const struct of_device_id twl_gpio_match[] = {
{ .compatible = "ti,twl4030-gpio", }, { .compatible = "ti,twl4030-gpio", },
{ }, { },
......
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