usb: musb: omap2430.c delete unused variable.
authorMatthias Brugger <mbrugger@iseebcn.com>
Thu, 16 Aug 2012 11:00:25 +0000 (13:00 +0200)
committerFelipe Balbi <balbi@ti.com>
Mon, 20 Aug 2012 07:20:04 +0000 (10:20 +0300)
Variable ret is always evaluated as true, so we don't need to check it.

Signed-off-by: Matthias Brugger <mbrugger@iseebcn.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/musb/omap2430.c

index af5f421..02c39a7 100644 (file)
@@ -141,7 +141,6 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
        struct usb_otg  *otg = musb->xceiv->otg;
        u8              devctl;
        unsigned long timeout = jiffies + msecs_to_jiffies(1000);
-       int ret = 1;
        /* HDRC controls CPEN, but beware current surges during device
         * connect.  They can trigger transient overcurrent conditions
         * that must be ignored.
@@ -168,12 +167,11 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
                                    || loops-- <= 0) {
                                        dev_err(musb->controller,
                                        "configured as A device timeout");
-                                       ret = -EINVAL;
                                        break;
                                }
                        }
 
-                       if (ret && otg->set_vbus)
+                       if (otg->set_vbus)
                                otg_set_vbus(otg, 1);
                } else {
                        musb->is_active = 1;