From: Benjamin Herrenschmidt Date: Thu, 28 Dec 2006 04:27:27 +0000 (+1100) Subject: USB: Fix EHCI warning X-Git-Tag: v2.6.21-rc1~92^2~29^2~61 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d728e327d4f86df439fa6b6f2f64b278394a58cc;p=linux-2.6 USB: Fix EHCI warning 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 --- diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 5f28b74bb8..3ce7249085 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -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 } /*-------------------------------------------------------------------------*/