[PATCH v2] usb: ehci-s5p: Use devm for requesting ehci_vbus_gpio

[PATCH v2] usb: ehci-s5p: Use devm for requesting ehci_vbus_gpio

[Doug Anderson]

The ehci_vbus_gpio is requested but never freed.  This can cause
problems with deferred probes and would cause problems if
s5p_ehci_remove was ever called.  Use devm to fix this.

Signed-off-by: Doug Anderson <dianders@chromium.org>
---
Changes in v2:
- &pdev->dev => dev elsewhere in s5p_setup_vbus_gpio()

 drivers/usb/host/ehci-s5p.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
index 20ebf6a..738490e 100644
--- a/drivers/usb/host/ehci-s5p.c
+++ b/drivers/usb/host/ehci-s5p.c
@@ -92,20 +92,21 @@ static void s5p_ehci_phy_disable(struct s5p_ehci_hcd *s5p_ehci)
 
 static void s5p_setup_vbus_gpio(struct platform_device *pdev)
 {
+	struct device *dev = &pdev->dev;
 	int err;
 	int gpio;
 
-	if (!pdev->dev.of_node)
+	if (!dev->of_node)
 		return;
 
-	gpio = of_get_named_gpio(pdev->dev.of_node,
-			"samsung,vbus-gpio", 0);
+	gpio = of_get_named_gpio(dev->of_node, "samsung,vbus-gpio", 0);
 	if (!gpio_is_valid(gpio))
 		return;
 
-	err = gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "ehci_vbus_gpio");
+	err = devm_gpio_request_one(dev, gpio, GPIOF_OUT_INIT_HIGH,
+				    "ehci_vbus_gpio");
 	if (err)
-		dev_err(&pdev->dev, "can't request ehci vbus gpio %d", gpio);
+		dev_err(dev, "can't request ehci vbus gpio %d", gpio);
 }
 
 static u64 ehci_s5p_dma_mask = DMA_BIT_MASK(32);
-- 
1.8.1.3

Re: [PATCH v2] usb: ehci-s5p: Use devm for requesting ehci_vbus_gpio

[Jingoo Han]

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

On Friday, March 15, 2013 12:16 PM, Doug Anderson wrote:
> 
> The ehci_vbus_gpio is requested but never freed.  This can cause
> problems with deferred probes and would cause problems if
> s5p_ehci_remove was ever called.  Use devm to fix this.
> 
> Signed-off-by: Doug Anderson <dianders@chromium.org>

Acked-by: Jingoo Han <jg1.han@samsung.com>


Best regards,
Jingoo Han

> ---
> Changes in v2:
> - &pdev->dev => dev elsewhere in s5p_setup_vbus_gpio()
> 
>  drivers/usb/host/ehci-s5p.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
> index 20ebf6a..738490e 100644
> --- a/drivers/usb/host/ehci-s5p.c
> +++ b/drivers/usb/host/ehci-s5p.c
> @@ -92,20 +92,21 @@ static void s5p_ehci_phy_disable(struct s5p_ehci_hcd *s5p_ehci)
> 
>  static void s5p_setup_vbus_gpio(struct platform_device *pdev)
>  {
> +	struct device *dev = &pdev->dev;
>  	int err;
>  	int gpio;
> 
> -	if (!pdev->dev.of_node)
> +	if (!dev->of_node)
>  		return;
> 
> -	gpio = of_get_named_gpio(pdev->dev.of_node,
> -			"samsung,vbus-gpio", 0);
> +	gpio = of_get_named_gpio(dev->of_node, "samsung,vbus-gpio", 0);
>  	if (!gpio_is_valid(gpio))
>  		return;
> 
> -	err = gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "ehci_vbus_gpio");
> +	err = devm_gpio_request_one(dev, gpio, GPIOF_OUT_INIT_HIGH,
> +				    "ehci_vbus_gpio");
>  	if (err)
> -		dev_err(&pdev->dev, "can't request ehci vbus gpio %d", gpio);
> +		dev_err(dev, "can't request ehci vbus gpio %d", gpio);
>  }
> 
>  static u64 ehci_s5p_dma_mask = DMA_BIT_MASK(32);
> --
> 1.8.1.3
ÿôèº{.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 v2] usb: ehci-s5p: Use devm for requesting ehci_vbus_gpio

[Vivek Gautam]

Hi,


On Fri, Mar 15, 2013 at 8:58 AM, Jingoo Han <jg1.han@samsung.com> wrote:
> On Friday, March 15, 2013 12:16 PM, Doug Anderson wrote:
>>
>> The ehci_vbus_gpio is requested but never freed.  This can cause
>> problems with deferred probes and would cause problems if
>> s5p_ehci_remove was ever called.  Use devm to fix this.
>>
>> Signed-off-by: Doug Anderson <dianders@chromium.org>
>
> Acked-by: Jingoo Han <jg1.han@samsung.com>
>
>
> Best regards,
> Jingoo Han
>
>> ---
>> Changes in v2:
>> - &pdev->dev => dev elsewhere in s5p_setup_vbus_gpio()
>>
>>  drivers/usb/host/ehci-s5p.c | 11 ++++++-----
>>  1 file changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
>> index 20ebf6a..738490e 100644
>> --- a/drivers/usb/host/ehci-s5p.c
>> +++ b/drivers/usb/host/ehci-s5p.c
>> @@ -92,20 +92,21 @@ static void s5p_ehci_phy_disable(struct s5p_ehci_hcd *s5p_ehci)
>>
>>  static void s5p_setup_vbus_gpio(struct platform_device *pdev)
>>  {
>> +     struct device *dev = &pdev->dev;
>>       int err;
>>       int gpio;
>>
>> -     if (!pdev->dev.of_node)
>> +     if (!dev->of_node)
>>               return;
>>
>> -     gpio = of_get_named_gpio(pdev->dev.of_node,
>> -                     "samsung,vbus-gpio", 0);
>> +     gpio = of_get_named_gpio(dev->of_node, "samsung,vbus-gpio", 0);
>>       if (!gpio_is_valid(gpio))
>>               return;
>>
>> -     err = gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "ehci_vbus_gpio");
>> +     err = devm_gpio_request_one(dev, gpio, GPIOF_OUT_INIT_HIGH,
>> +                                 "ehci_vbus_gpio");
>>       if (err)
>> -             dev_err(&pdev->dev, "can't request ehci vbus gpio %d", gpio);
>> +             dev_err(dev, "can't request ehci vbus gpio %d", gpio);
>>  }
>>

tested this patch with smdk5250 h/w.

Without this patch get following kernel message (since ehci-s5p's
probe was being deferred
due to unavailability of PHY and we were trying to request gpio once again) :
[    1.175000] s5p-ehci 12110000.usb: can't request ehci vbus gpio 177

which however goes away after applying this patch.

Tested-by: Vivek Gautam <gautam.vivek@samsung.com>


-- 
Thanks & Regards
Vivek

RE: [PATCH v2] usb: ehci-s5p: Use devm for requesting ehci_vbus_gpio

[Kukjin Kim]

Doug Anderson wrote:
> 
> The ehci_vbus_gpio is requested but never freed.  This can cause
> problems with deferred probes and would cause problems if
> s5p_ehci_remove was ever called.  Use devm to fix this.
> 
> Signed-off-by: Doug Anderson <dianders@chromium.org>

Acked-by: Kukjin Kim <kgene.kim@samsung.com>

Thanks.

- Kukjin

> ---
> Changes in v2:
> - &pdev->dev => dev elsewhere in s5p_setup_vbus_gpio()
> 
>  drivers/usb/host/ehci-s5p.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
> index 20ebf6a..738490e 100644
> --- a/drivers/usb/host/ehci-s5p.c
> +++ b/drivers/usb/host/ehci-s5p.c
> @@ -92,20 +92,21 @@ static void s5p_ehci_phy_disable(struct s5p_ehci_hcd
> *s5p_ehci)
> 
>  static void s5p_setup_vbus_gpio(struct platform_device *pdev)
>  {
> +	struct device *dev = &pdev->dev;
>  	int err;
>  	int gpio;
> 
> -	if (!pdev->dev.of_node)
> +	if (!dev->of_node)
>  		return;
> 
> -	gpio = of_get_named_gpio(pdev->dev.of_node,
> -			"samsung,vbus-gpio", 0);
> +	gpio = of_get_named_gpio(dev->of_node, "samsung,vbus-gpio", 0);
>  	if (!gpio_is_valid(gpio))
>  		return;
> 
> -	err = gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "ehci_vbus_gpio");
> +	err = devm_gpio_request_one(dev, gpio, GPIOF_OUT_INIT_HIGH,
> +				    "ehci_vbus_gpio");
>  	if (err)
> -		dev_err(&pdev->dev, "can't request ehci vbus gpio %d",
gpio);
> +		dev_err(dev, "can't request ehci vbus gpio %d", gpio);
>  }
> 
>  static u64 ehci_s5p_dma_mask = DMA_BIT_MASK(32);
> --
> 1.8.1.3