Commit 96f90a8b authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

USB: host/ohci-hcd.c: fix sparse warnings

Fix sparse warnings in drivers/usb/host/ohci-hcd.c.

Four of the following sparse warning are seen when building on
ARM due do the macro raw_local_irq_save():

	warning: symbol 'temp' shadows an earlier one
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 367815ee
...@@ -571,7 +571,7 @@ static int ohci_init (struct ohci_hcd *ohci) ...@@ -571,7 +571,7 @@ static int ohci_init (struct ohci_hcd *ohci)
*/ */
static int ohci_run (struct ohci_hcd *ohci) static int ohci_run (struct ohci_hcd *ohci)
{ {
u32 mask, temp; u32 mask, val;
int first = ohci->fminterval == 0; int first = ohci->fminterval == 0;
struct usb_hcd *hcd = ohci_to_hcd(ohci); struct usb_hcd *hcd = ohci_to_hcd(ohci);
...@@ -580,8 +580,8 @@ static int ohci_run (struct ohci_hcd *ohci) ...@@ -580,8 +580,8 @@ static int ohci_run (struct ohci_hcd *ohci)
/* boot firmware should have set this up (5.1.1.3.1) */ /* boot firmware should have set this up (5.1.1.3.1) */
if (first) { if (first) {
temp = ohci_readl (ohci, &ohci->regs->fminterval); val = ohci_readl (ohci, &ohci->regs->fminterval);
ohci->fminterval = temp & 0x3fff; ohci->fminterval = val & 0x3fff;
if (ohci->fminterval != FI) if (ohci->fminterval != FI)
ohci_dbg (ohci, "fminterval delta %d\n", ohci_dbg (ohci, "fminterval delta %d\n",
ohci->fminterval - FI); ohci->fminterval - FI);
...@@ -600,25 +600,25 @@ static int ohci_run (struct ohci_hcd *ohci) ...@@ -600,25 +600,25 @@ static int ohci_run (struct ohci_hcd *ohci)
switch (ohci->hc_control & OHCI_CTRL_HCFS) { switch (ohci->hc_control & OHCI_CTRL_HCFS) {
case OHCI_USB_OPER: case OHCI_USB_OPER:
temp = 0; val = 0;
break; break;
case OHCI_USB_SUSPEND: case OHCI_USB_SUSPEND:
case OHCI_USB_RESUME: case OHCI_USB_RESUME:
ohci->hc_control &= OHCI_CTRL_RWC; ohci->hc_control &= OHCI_CTRL_RWC;
ohci->hc_control |= OHCI_USB_RESUME; ohci->hc_control |= OHCI_USB_RESUME;
temp = 10 /* msec wait */; val = 10 /* msec wait */;
break; break;
// case OHCI_USB_RESET: // case OHCI_USB_RESET:
default: default:
ohci->hc_control &= OHCI_CTRL_RWC; ohci->hc_control &= OHCI_CTRL_RWC;
ohci->hc_control |= OHCI_USB_RESET; ohci->hc_control |= OHCI_USB_RESET;
temp = 50 /* msec wait */; val = 50 /* msec wait */;
break; break;
} }
ohci_writel (ohci, ohci->hc_control, &ohci->regs->control); ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
// flush the writes // flush the writes
(void) ohci_readl (ohci, &ohci->regs->control); (void) ohci_readl (ohci, &ohci->regs->control);
msleep(temp); msleep(val);
memset (ohci->hcca, 0, sizeof (struct ohci_hcca)); memset (ohci->hcca, 0, sizeof (struct ohci_hcca));
...@@ -628,9 +628,9 @@ static int ohci_run (struct ohci_hcd *ohci) ...@@ -628,9 +628,9 @@ static int ohci_run (struct ohci_hcd *ohci)
retry: retry:
/* HC Reset requires max 10 us delay */ /* HC Reset requires max 10 us delay */
ohci_writel (ohci, OHCI_HCR, &ohci->regs->cmdstatus); ohci_writel (ohci, OHCI_HCR, &ohci->regs->cmdstatus);
temp = 30; /* ... allow extra time */ val = 30; /* ... allow extra time */
while ((ohci_readl (ohci, &ohci->regs->cmdstatus) & OHCI_HCR) != 0) { while ((ohci_readl (ohci, &ohci->regs->cmdstatus) & OHCI_HCR) != 0) {
if (--temp == 0) { if (--val == 0) {
spin_unlock_irq (&ohci->lock); spin_unlock_irq (&ohci->lock);
ohci_err (ohci, "USB HC reset timed out!\n"); ohci_err (ohci, "USB HC reset timed out!\n");
return -1; return -1;
...@@ -699,23 +699,23 @@ static int ohci_run (struct ohci_hcd *ohci) ...@@ -699,23 +699,23 @@ static int ohci_run (struct ohci_hcd *ohci)
ohci_writel (ohci, mask, &ohci->regs->intrenable); ohci_writel (ohci, mask, &ohci->regs->intrenable);
/* handle root hub init quirks ... */ /* handle root hub init quirks ... */
temp = roothub_a (ohci); val = roothub_a (ohci);
temp &= ~(RH_A_PSM | RH_A_OCPM); val &= ~(RH_A_PSM | RH_A_OCPM);
if (ohci->flags & OHCI_QUIRK_SUPERIO) { if (ohci->flags & OHCI_QUIRK_SUPERIO) {
/* NSC 87560 and maybe others */ /* NSC 87560 and maybe others */
temp |= RH_A_NOCP; val |= RH_A_NOCP;
temp &= ~(RH_A_POTPGT | RH_A_NPS); val &= ~(RH_A_POTPGT | RH_A_NPS);
ohci_writel (ohci, temp, &ohci->regs->roothub.a); ohci_writel (ohci, val, &ohci->regs->roothub.a);
} else if ((ohci->flags & OHCI_QUIRK_AMD756) || } else if ((ohci->flags & OHCI_QUIRK_AMD756) ||
(ohci->flags & OHCI_QUIRK_HUB_POWER)) { (ohci->flags & OHCI_QUIRK_HUB_POWER)) {
/* hub power always on; required for AMD-756 and some /* hub power always on; required for AMD-756 and some
* Mac platforms. ganged overcurrent reporting, if any. * Mac platforms. ganged overcurrent reporting, if any.
*/ */
temp |= RH_A_NPS; val |= RH_A_NPS;
ohci_writel (ohci, temp, &ohci->regs->roothub.a); ohci_writel (ohci, val, &ohci->regs->roothub.a);
} }
ohci_writel (ohci, RH_HS_LPSC, &ohci->regs->roothub.status); ohci_writel (ohci, RH_HS_LPSC, &ohci->regs->roothub.status);
ohci_writel (ohci, (temp & RH_A_NPS) ? 0 : RH_B_PPCM, ohci_writel (ohci, (val & RH_A_NPS) ? 0 : RH_B_PPCM,
&ohci->regs->roothub.b); &ohci->regs->roothub.b);
// flush those writes // flush those writes
(void) ohci_readl (ohci, &ohci->regs->control); (void) ohci_readl (ohci, &ohci->regs->control);
...@@ -724,7 +724,7 @@ static int ohci_run (struct ohci_hcd *ohci) ...@@ -724,7 +724,7 @@ static int ohci_run (struct ohci_hcd *ohci)
spin_unlock_irq (&ohci->lock); spin_unlock_irq (&ohci->lock);
// POTPGT delay is bits 24-31, in 2 ms units. // POTPGT delay is bits 24-31, in 2 ms units.
mdelay ((temp >> 23) & 0x1fe); mdelay ((val >> 23) & 0x1fe);
hcd->state = HC_STATE_RUNNING; hcd->state = HC_STATE_RUNNING;
if (quirk_zfmicro(ohci)) { if (quirk_zfmicro(ohci)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment