USB: Fix EHCI warning
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 28 Dec 2006 04:27:27 +0000 (15:27 +1100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 7 Feb 2007 23:44:32 +0000 (15:44 -0800)
This patch fixes a warning introduced by the big endian MMIO EHCI
support patch on platforms that don't have readl_be/writel_be variants
(though mostly harmless as those are called in an if (0) statement,
but gcc still warns).

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
drivers/usb/host/ehci.h

index 5f28b74bb8d33affab1cbf025bf71a9810b5dcd2..3ce7249085d5a8ad31b0bd9f390196d216ad4620 100644 (file)
@@ -671,17 +671,25 @@ ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc)
 static inline unsigned int ehci_readl (const struct ehci_hcd *ehci,
                                       __u32 __iomem * regs)
 {
+#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
        return ehci_big_endian_mmio(ehci) ?
                readl_be((__force u32 *)regs) :
                readl((__force u32 *)regs);
+#else
+       return readl((__force u32 *)regs);
+#endif
 }
 
 static inline void ehci_writel (const struct ehci_hcd *ehci,
                                const unsigned int val, __u32 __iomem *regs)
 {
+#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
        ehci_big_endian_mmio(ehci) ?
                writel_be(val, (__force u32 *)regs) :
                writel(val, (__force u32 *)regs);
+#else
+       writel(val, (__force u32 *)regs);
+#endif
 }
 
 /*-------------------------------------------------------------------------*/