* [PATCH] usb/musb/omap2430.c Delete unused variable
@ 2012-08-16 10:22 Matthias Brugger
2012-08-16 10:19 ` Felipe Balbi
0 siblings, 1 reply; 3+ messages in thread
From: Matthias Brugger @ 2012-08-16 10:22 UTC (permalink / raw)
To: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-omap, linux-kernel
Cc: Matthias Brugger
Signed-off-by: Matthias Brugger <mbrugger@iseebcn.com>
---
drivers/usb/musb/omap2430.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 5fdb9da..2d207c6 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -140,7 +140,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.
@@ -164,12 +163,11 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
if (time_after(jiffies, timeout)) {
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;
--
1.7.9.5
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] usb/musb/omap2430.c Delete unused variable
2012-08-16 10:22 [PATCH] usb/musb/omap2430.c Delete unused variable Matthias Brugger
@ 2012-08-16 10:19 ` Felipe Balbi
2012-08-16 11:00 ` Matthias Brugger
0 siblings, 1 reply; 3+ messages in thread
From: Felipe Balbi @ 2012-08-16 10:19 UTC (permalink / raw)
To: Matthias Brugger
Cc: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-omap, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
On Thu, Aug 16, 2012 at 12:22:14PM +0200, Matthias Brugger wrote:
> Signed-off-by: Matthias Brugger <mbrugger@iseebcn.com>
I need a commit log, even if obvious.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] usb/musb/omap2430.c Delete unused variable.
2012-08-16 10:19 ` Felipe Balbi
@ 2012-08-16 11:00 ` Matthias Brugger
0 siblings, 0 replies; 3+ messages in thread
From: Matthias Brugger @ 2012-08-16 11:00 UTC (permalink / raw)
To: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-omap, linux-kernel
Cc: Matthias Brugger
Variable ret is always evaluated as true, so we don't need to check it.
Signed-off-by: Matthias Brugger <mbrugger@iseebcn.com>
---
drivers/usb/musb/omap2430.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 5fdb9da..2d207c6 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -140,7 +140,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.
@@ -164,12 +163,11 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
if (time_after(jiffies, timeout)) {
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;
--
1.7.9.5
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-16 11:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-16 10:22 [PATCH] usb/musb/omap2430.c Delete unused variable Matthias Brugger
2012-08-16 10:19 ` Felipe Balbi
2012-08-16 11:00 ` Matthias Brugger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®