2013-03-14 23:59:41

by Doug Anderson

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

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 <[email protected]>
---
drivers/usb/host/ehci-s5p.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
index 20ebf6a..a464197 100644
--- a/drivers/usb/host/ehci-s5p.c
+++ b/drivers/usb/host/ehci-s5p.c
@@ -92,6 +92,7 @@ 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;

@@ -103,7 +104,8 @@ static void s5p_setup_vbus_gpio(struct platform_device *pdev)
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);
}
--
1.8.1.3

2013-03-15 00:30:47

by Jingoo Han

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

On Wednesday, March 13, 2013 4:03 AM, 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 <[email protected]>
> ---
> drivers/usb/host/ehci-s5p.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
> index 20ebf6a..a464197 100644
> --- a/drivers/usb/host/ehci-s5p.c
> +++ b/drivers/usb/host/ehci-s5p.c
> @@ -92,6 +92,7 @@ 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;

Hi Doug Anderson,

Would you replace other '&pdev->dev' with 'dev' in s5p_setup_vbus_gpio()
as below? It seems to be better for readability.

- gpio = of_get_named_gpio(pdev->dev.of_node,
+ 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);


Best regards,
Jingoo Han

> int err;
> int gpio;
>
> @@ -103,7 +104,8 @@ static void s5p_setup_vbus_gpio(struct platform_device *pdev)
> 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);
> }
> --
> 1.8.1.3
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m????????????I?

2013-03-15 03:15:53

by Doug Anderson

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

Jingoo,

On Thu, Mar 14, 2013 at 5:30 PM, Jingoo Han <[email protected]> wrote:
> Would you replace other '&pdev->dev' with 'dev' in s5p_setup_vbus_gpio()
> as below? It seems to be better for readability.

Yes, of course. That was silly of me not to add the "dev" local and
not update the other places... Thanks for your review!

-Doug

2013-03-15 03:16:00

by Doug Anderson

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

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 <[email protected]>
---
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

2013-03-15 03:28:59

by Jingoo Han

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

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 <[email protected]>

Acked-by: Jingoo Han <[email protected]>


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?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m????????????I?

2013-03-18 13:48:21

by Vivek Gautam

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

Hi,


On Fri, Mar 15, 2013 at 8:58 AM, Jingoo Han <[email protected]> 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 <[email protected]>
>
> Acked-by: Jingoo Han <[email protected]>
>
>
> 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 <[email protected]>


--
Thanks & Regards
Vivek

2013-03-25 09:29:20

by Kukjin Kim

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

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 <[email protected]>

Acked-by: Kukjin Kim <[email protected]>

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