2012-11-08 02:27:43

by Axel Lin

Subject: [PATCH] gpio: mvebu: Set free callback for gpio_chip

We call pinctrl_request_gpio() in request callback, thus we need to call
pinctrl_free_gpio() in free callback.

Both mvebu_gpio_request() and mvebu_gpio_free() are not referenced outside of
this file, make them static.

Signed-off-by: Axel Lin <[email protected]>
---
drivers/gpio/gpio-mvebu.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c
index 325c3de..a515b92 100644
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
@@ -168,12 +168,12 @@ static void __iomem *mvebu_gpioreg_level_mask(struct mvebu_gpio_chip *mvchip)
* Functions implementing the gpio_chip methods
*/

-int mvebu_gpio_request(struct gpio_chip *chip, unsigned pin)
+static int mvebu_gpio_request(struct gpio_chip *chip, unsigned pin)
{
return pinctrl_request_gpio(chip->base + pin);
}

-void mvebu_gpio_free(struct gpio_chip *chip, unsigned pin)
+static void mvebu_gpio_free(struct gpio_chip *chip, unsigned pin)
{
pinctrl_free_gpio(chip->base + pin);
}
@@ -546,6 +546,7 @@ static int __devinit mvebu_gpio_probe(struct platform_device *pdev)
mvchip->chip.label = dev_name(&pdev->dev);
mvchip->chip.dev = &pdev->dev;
mvchip->chip.request = mvebu_gpio_request;
+ mvchip->chip.free = mvebu_gpio_free;
mvchip->chip.direction_input = mvebu_gpio_direction_input;
mvchip->chip.get = mvebu_gpio_get;
mvchip->chip.direction_output = mvebu_gpio_direction_output;
--
1.7.9.5

2012-11-08 07:10:30

by Thomas Petazzoni

Subject: Re: [PATCH] gpio: mvebu: Set free callback for gpio_chip

On Thu, 08 Nov 2012 10:27:29 +0800, Axel Lin wrote:
> We call pinctrl_request_gpio() in request callback, thus we need to call
> pinctrl_free_gpio() in free callback.
>
> Both mvebu_gpio_request() and mvebu_gpio_free() are not referenced outside of
> this file, make them static.

Indeed, thanks.

> Signed-off-by: Axel Lin <[email protected]>

Acked-by: Thomas Petazzoni <[email protected]>
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

2012-11-08 21:38:35

by Linus Walleij

Subject: Re: [PATCH] gpio: mvebu: Set free callback for gpio_chip

On Thu, Nov 8, 2012 at 3:27 AM, Axel Lin <[email protected]> wrote:

> We call pinctrl_request_gpio() in request callback, thus we need to call
> pinctrl_free_gpio() in free callback.
>
> Both mvebu_gpio_request() and mvebu_gpio_free() are not referenced outside of
> this file, make them static.
>
> Signed-off-by: Axel Lin <[email protected]>

Applied with Thomas' ACK, thanks!

Yours,
Linus Walleij