redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] USB: Kill compiler warning in quirk_usb_handoff_ohci

Browse source 
Move variables only used on !__hppa__ into that #ifndef section. This
cleans up a compiler warning on parisc. Problem pointed out by
Joel Soete.

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kyle McMartin 2006-06-25 18:45:29 -04:00 committed by Greg Kroah-Hartman
parent 224654004c
commit c1b45f247a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/usb/host/pci-quirks.c
View file

@ -167,8 +167,6 @@ static int __devinit mmio_resource_enabled(struct pci_dev *pdev, int idx)
static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev) static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev)
{ {
void __iomem *base; void __iomem *base;
int wait_time;
u32 control;
if (!mmio_resource_enabled(pdev, 0)) if (!mmio_resource_enabled(pdev, 0))
return; return;
@ -179,9 +177,10 @@ static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev)
/* On PA-RISC, PDC can leave IR set incorrectly; ignore it there. */ /* On PA-RISC, PDC can leave IR set incorrectly; ignore it there. */
#ifndef __hppa__ #ifndef __hppa__
control = readl(base + OHCI_CONTROL); {
u32 control = readl(base + OHCI_CONTROL);
if (control & OHCI_CTRL_IR) { if (control & OHCI_CTRL_IR) {
wait_time = 500; /* arbitrary; 5 seconds */ int wait_time = 500; /* arbitrary; 5 seconds */
writel(OHCI_INTR_OC, base + OHCI_INTRENABLE); writel(OHCI_INTR_OC, base + OHCI_INTRENABLE);
writel(OHCI_OCR, base + OHCI_CMDSTATUS); writel(OHCI_OCR, base + OHCI_CMDSTATUS);
while (wait_time > 0 && while (wait_time > 0 &&
@ -198,6 +197,7 @@ static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev)
/* reset controller, preserving RWC */ /* reset controller, preserving RWC */
writel(control & OHCI_CTRL_RWC, base + OHCI_CONTROL); writel(control & OHCI_CTRL_RWC, base + OHCI_CONTROL);
} }
}
#endif #endif
/* /*