lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: Fix EHCI warning

Browse Source 
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>
This commit is contained in:
Benjamin Herrenschmidt
2006-12-28 15:27:27 +11:00
committed by Greg Kroah-Hartman
parent b32e904d54
commit d728e327d4
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/host/ehci.h
View 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, static inline unsigned int ehci_readl (const struct ehci_hcd *ehci,
__u32 __iomem * regs) __u32 __iomem * regs)
{ {
#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
return ehci_big_endian_mmio(ehci) ? return ehci_big_endian_mmio(ehci) ?
readl_be((__force u32 *)regs) : readl_be((__force u32 *)regs) :
readl((__force u32 *)regs); readl((__force u32 *)regs);
#else
return readl((__force u32 *)regs);
#endif
} }
static inline void ehci_writel (const struct ehci_hcd *ehci, static inline void ehci_writel (const struct ehci_hcd *ehci,
const unsigned int val, __u32 __iomem *regs) const unsigned int val, __u32 __iomem *regs)
{ {
#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
ehci_big_endian_mmio(ehci) ? ehci_big_endian_mmio(ehci) ?
writel_be(val, (__force u32 *)regs) : writel_be(val, (__force u32 *)regs) :
writel(val, (__force u32 *)regs); writel(val, (__force u32 *)regs);
#else
writel(val, (__force u32 *)regs);
#endif
} }
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/