]> err.no Git - linux-2.6/commitdiff
USB: Fix OHCI warning
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 28 Dec 2006 04:26:59 +0000 (15:26 +1100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 7 Feb 2007 23:44:32 +0000 (15:44 -0800)
This patch fixes a warning introduces by the split endian OHCI 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/host/ohci.h

index fc7c1614cf9e001265d1e2beb0379c27451ee12b..0dafcda3729126320e46918e79411d2acc8a6555 100644 (file)
@@ -505,17 +505,25 @@ static inline struct usb_hcd *ohci_to_hcd (const struct ohci_hcd *ohci)
 static inline unsigned int _ohci_readl (const struct ohci_hcd *ohci,
                                        __hc32 __iomem * regs)
 {
+#ifdef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO
        return big_endian_mmio(ohci) ?
                readl_be ((__force u32 *)regs) :
                readl ((__force u32 *)regs);
+#else
+       return readl ((__force u32 *)regs);
+#endif
 }
 
 static inline void _ohci_writel (const struct ohci_hcd *ohci,
                                 const unsigned int val, __hc32 __iomem *regs)
 {
+#ifdef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO
        big_endian_mmio(ohci) ?
                writel_be (val, (__force u32 *)regs) :
                writel (val, (__force u32 *)regs);
+#else
+               writel (val, (__force u32 *)regs);
+#endif
 }
 
 #ifdef CONFIG_ARCH_LH7A404