diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-12-28 15:26:59 +1100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 15:44:32 -0800 |
| commit | b32e904d54d163c6f97fc3c7586d381f4f11c3a5 (patch) | |
| tree | f06669d447a8e2d4e6648394f54c9d7a1d4178e8 | |
| parent | 083522d76662cda71328df1f3d75e5a9057c7c9f (diff) | |
| download | blackbird-op-linux-b32e904d54d163c6f97fc3c7586d381f4f11c3a5.tar.gz blackbird-op-linux-b32e904d54d163c6f97fc3c7586d381f4f11c3a5.zip | |
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 <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/usb/host/ohci.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h index fc7c1614cf9e..0dafcda37291 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 |
