From: Benjamin Herrenschmidt Date: Thu, 28 Dec 2006 04:26:59 +0000 (+1100) Subject: USB: Fix OHCI warning X-Git-Tag: v2.6.21-rc1~92^2~29^2~62 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b32e904d54d163c6f97fc3c7586d381f4f11c3a5;p=linux-2.6 USB: Fix OHCI warning 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h index fc7c1614cf..0dafcda372 100644 --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h @@ -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