[PATCH] usb: usb251xb: fix optional reset gpio request

[PATCH] usb: usb251xb: fix optional reset gpio request

[Marco Felsch]

Linux requests the reset gpio optional by using devm_gpiod_get_optional().
We need to do this here too because the reset can be a global shared
reset line e.g. board por. We haven't such a helper so just drop the
final else path.

Fixes: 937fa50d9c ("usb: Port Microchip USB251x USB hub driver from Linux")
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 drivers/usb/misc/usb251xb.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c
index 97f55efa82..006ee3b426 100644
--- a/drivers/usb/misc/usb251xb.c
+++ b/drivers/usb/misc/usb251xb.c
@@ -339,7 +339,7 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
 {
 	struct device_d *dev = hub->dev;
 	struct device_node *np = dev->device_node;
-	int len, err, i;
+	int len, i;
 	u32 port, property_u32 = 0;
 	const u32 *cproperty_u32;
 	const char *cproperty_char;
@@ -374,10 +374,6 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
 			return ret;
 	} else if (hub->gpio_reset == -EPROBE_DEFER) {
 		return -EPROBE_DEFER;
-	} else {
-		err = hub->gpio_reset;
-		dev_err(dev, "unable to request GPIO reset pin (%d)\n", err);
-		return err;
 	}
 
 	if (of_property_read_u16_array(np, "vendor-id", &hub->vendor_id, 1))
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] usb: usb251xb: fix optional reset gpio request

[Sascha Hauer]

On Mon, Jun 17, 2019 at 11:51:25AM +0200, Marco Felsch wrote:
> Linux requests the reset gpio optional by using devm_gpiod_get_optional().
> We need to do this here too because the reset can be a global shared
> reset line e.g. board por. We haven't such a helper so just drop the
> final else path.
> 
> Fixes: 937fa50d9c ("usb: Port Microchip USB251x USB hub driver from Linux")
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> ---
>  drivers/usb/misc/usb251xb.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c
> index 97f55efa82..006ee3b426 100644
> --- a/drivers/usb/misc/usb251xb.c
> +++ b/drivers/usb/misc/usb251xb.c
> @@ -339,7 +339,7 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
>  {
>  	struct device_d *dev = hub->dev;
>  	struct device_node *np = dev->device_node;
> -	int len, err, i;
> +	int len, i;
>  	u32 port, property_u32 = 0;
>  	const u32 *cproperty_u32;
>  	const char *cproperty_char;
> @@ -374,10 +374,6 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
>  			return ret;
>  	} else if (hub->gpio_reset == -EPROBE_DEFER) {
>  		return -EPROBE_DEFER;
> -	} else {
> -		err = hub->gpio_reset;
> -		dev_err(dev, "unable to request GPIO reset pin (%d)\n", err);
> -		return err;
>  	}
>  
>  	if (of_property_read_u16_array(np, "vendor-id", &hub->vendor_id, 1))
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox