[PATCH] extcon: gpio: Request gpio pin before modifying its state

[PATCH] extcon: gpio: Request gpio pin before modifying its state

[Guenter Roeck]

Commit 338de0ca (extcon: gpio: Use gpio driver/chip debounce if supported)
introduced a call to gpio_set_debounce() before actually requesting the
respective gpio pin from the gpio subsystem.

The gpio subsystem expects that a gpio pin was requested before modifying its
state. Not doing so results in a warning from gpiolib, and the gpio pin is
auto-requested. This in turn causes the subsequent devm_gpio_request_one()
to fail. So devm_gpio_request_one() must be called prior to calling
gpio_set_debounce().

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 drivers/extcon/extcon-gpio.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c
index 7e0dff5..4736a9c 100644
--- a/drivers/extcon/extcon-gpio.c
+++ b/drivers/extcon/extcon-gpio.c
@@ -105,6 +105,12 @@ static int gpio_extcon_probe(struct platform_device *pdev)
 	extcon_data->state_off = pdata->state_off;
 	if (pdata->state_on && pdata->state_off)
 		extcon_data->edev.print_state = extcon_gpio_print_state;
+
+	ret = devm_gpio_request_one(&pdev->dev, extcon_data->gpio, GPIOF_DIR_IN,
+				    pdev->name);
+	if (ret < 0)
+		return ret;
+
 	if (pdata->debounce) {
 		ret = gpio_set_debounce(extcon_data->gpio,
 					pdata->debounce * 1000);
@@ -117,11 +123,6 @@ static int gpio_extcon_probe(struct platform_device *pdev)
 	if (ret < 0)
 		return ret;
 
-	ret = devm_gpio_request_one(&pdev->dev, extcon_data->gpio, GPIOF_DIR_IN,
-				    pdev->name);
-	if (ret < 0)
-		goto err;
-
 	INIT_DELAYED_WORK(&extcon_data->work, gpio_extcon_work);
 
 	extcon_data->irq = gpio_to_irq(extcon_data->gpio);
-- 
1.7.9.7

Re: [PATCH] extcon: gpio: Request gpio pin before modifying its state

[MyungJoo Ham]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=euc-kr, Size: 1986 bytes --]

> Commit 338de0ca (extcon: gpio: Use gpio driver/chip debounce if supported)
> introduced a call to gpio_set_debounce() before actually requesting the
> respective gpio pin from the gpio subsystem.
> 
> The gpio subsystem expects that a gpio pin was requested before modifying its
> state. Not doing so results in a warning from gpiolib, and the gpio pin is
> auto-requested. This in turn causes the subsequent devm_gpio_request_one()
> to fail. So devm_gpio_request_one() must be called prior to calling
> gpio_set_debounce().
> 
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>

Thank you.


Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com>

> ---
>  drivers/extcon/extcon-gpio.c |   11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c
> index 7e0dff5..4736a9c 100644
> --- a/drivers/extcon/extcon-gpio.c
> +++ b/drivers/extcon/extcon-gpio.c
> @@ -105,6 +105,12 @@ static int gpio_extcon_probe(struct platform_device *pdev)
>  	extcon_data->state_off = pdata->state_off;
>  	if (pdata->state_on && pdata->state_off)
>  		extcon_data->edev.print_state = extcon_gpio_print_state;
> +
> +	ret = devm_gpio_request_one(&pdev->dev, extcon_data->gpio, GPIOF_DIR_IN,
> +				    pdev->name);
> +	if (ret < 0)
> +		return ret;
> +
>  	if (pdata->debounce) {
>  		ret = gpio_set_debounce(extcon_data->gpio,
>  					pdata->debounce * 1000);
> @@ -117,11 +123,6 @@ static int gpio_extcon_probe(struct platform_device *pdev)
>  	if (ret < 0)
>  		return ret;
>  
> -	ret = devm_gpio_request_one(&pdev->dev, extcon_data->gpio, GPIOF_DIR_IN,
> -				    pdev->name);
> -	if (ret < 0)
> -		goto err;
> -
>  	INIT_DELAYED_WORK(&extcon_data->work, gpio_extcon_work);
>  
>  	extcon_data->irq = gpio_to_irq(extcon_data->gpio);
> -- 
> 1.7.9.7
> 
> 
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: [PATCH] extcon: gpio: Request gpio pin before modifying its state

[Chanwoo Choi]

Hi Guenter,

On 11/23/2013 02:26 AM, Guenter Roeck wrote:
> Commit 338de0ca (extcon: gpio: Use gpio driver/chip debounce if supported)
> introduced a call to gpio_set_debounce() before actually requesting the
> respective gpio pin from the gpio subsystem.
> 
> The gpio subsystem expects that a gpio pin was requested before modifying its
> state. Not doing so results in a warning from gpiolib, and the gpio pin is
> auto-requested. This in turn causes the subsequent devm_gpio_request_one()
> to fail. So devm_gpio_request_one() must be called prior to calling
> gpio_set_debounce().
> 
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
>  drivers/extcon/extcon-gpio.c |   11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 

Applid it on extcon-next branch.

Thanks,
Chanwoo Choi

Re: [PATCH] extcon: gpio: Request gpio pin before modifying its state

[Guenter Roeck]

On 11/25/2013 11:55 PM, Chanwoo Choi wrote:
> Hi Guenter,
>
> On 11/23/2013 02:26 AM, Guenter Roeck wrote:
>> Commit 338de0ca (extcon: gpio: Use gpio driver/chip debounce if supported)
>> introduced a call to gpio_set_debounce() before actually requesting the
>> respective gpio pin from the gpio subsystem.
>>
>> The gpio subsystem expects that a gpio pin was requested before modifying its
>> state. Not doing so results in a warning from gpiolib, and the gpio pin is
>> auto-requested. This in turn causes the subsequent devm_gpio_request_one()
>> to fail. So devm_gpio_request_one() must be called prior to calling
>> gpio_set_debounce().
>>
>> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
>> ---
>>   drivers/extcon/extcon-gpio.c |   11 ++++++-----
>>   1 file changed, 6 insertions(+), 5 deletions(-)
>>
>
> Applid it on extcon-next branch.
>

As this is a bug fix, I think it would make sense to have this applied to the current
kernel and not wait for 3.14.

Thanks,
Guenter

Re: [PATCH] extcon: gpio: Request gpio pin before modifying its state

[Chanwoo Choi]

On 11/26/2013 09:07 PM, Guenter Roeck wrote:
> On 11/25/2013 11:55 PM, Chanwoo Choi wrote:
>> Hi Guenter,
>>
>> On 11/23/2013 02:26 AM, Guenter Roeck wrote:
>>> Commit 338de0ca (extcon: gpio: Use gpio driver/chip debounce if supported)
>>> introduced a call to gpio_set_debounce() before actually requesting the
>>> respective gpio pin from the gpio subsystem.
>>>
>>> The gpio subsystem expects that a gpio pin was requested before modifying its
>>> state. Not doing so results in a warning from gpiolib, and the gpio pin is
>>> auto-requested. This in turn causes the subsequent devm_gpio_request_one()
>>> to fail. So devm_gpio_request_one() must be called prior to calling
>>> gpio_set_debounce().
>>>
>>> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
>>> ---
>>>   drivers/extcon/extcon-gpio.c |   11 ++++++-----
>>>   1 file changed, 6 insertions(+), 5 deletions(-)
>>>
>>
>> Applid it on extcon-next branch.
>>
> 
> As this is a bug fix, I think it would make sense to have this applied to the current
> kernel and not wait for 3.14.
> 

OK, I move it on extcon-linus branch.

Thanks,
Chanwoo Choi