[parisc-linux] [PATCH] Kill compiler warning in quirk_usb_handoff_ohci

Kyle McMartin kyle at mcmartin.ca
Sun Jun 25 16:45:29 MDT 2006


From: Kyle McMartin <kyle at parisc-linux.org>

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 at parisc-linux.org>

--- linux-2.6/drivers/usb/host/pci-quirks.c	2006/04/19 04:56:02	1.7
+++ linux-2.6/drivers/usb/host/pci-quirks.c	2006/06/16 18:21:45	1.8
@@ -168,8 +168,6 @@
 static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev)
 {
 	void __iomem *base;
-	int wait_time;
-	u32 control;
 
 	if (!mmio_resource_enabled(pdev, 0))
 		return;
@@ -180,9 +178,10 @@
 
 /* On PA-RISC, PDC can leave IR set incorrectly; ignore it there. */
 #ifndef __hppa__
-	control = readl(base + OHCI_CONTROL);
+{
+	u32 control = readl(base + OHCI_CONTROL);
 	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_OCR, base + OHCI_CMDSTATUS);
 		while (wait_time > 0 &&
@@ -199,6 +198,7 @@
 		/* reset controller, preserving RWC */
 		writel(control & OHCI_CTRL_RWC, base + OHCI_CONTROL);
 	}
+}
 #endif
 
 	/*



More information about the parisc-linux mailing list