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

From: Jingoo Han
Date: Thu Mar 14 2013 - 20:30:51 EST


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 <dianders@xxxxxxxxxxxx>
> ---
> 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
?移»®&Þ~º&¶¬–+-깁負¥Šw®왢쎉喝méb욎dz받–)í끾èw*jgП¨¶‰šŽ듶¢j/곴äz받–듺2듷솳鈺Ú&¢)傘«a뛴®G«앶h®æj:+v돣Šwè녪¥>W슧違iÛaxPjØm¶Ÿÿà -»+껠dš_