aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-02-09 11:40:00 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 12:14:08 -0500
commit68f50e52554a0a55dfe2e3fdf659ee0569d73c3f (patch)
treed8e5cb9432157641e568a23247e09b5ca65d4a26 /drivers/usb/host
parent53ebb3b8264a77b6214f7a405300de8c24a12554 (diff)
[PATCH] hci_{read,write}l() does force casts to wrong type for no reason
readl() et.al. expect iomem pointer, so WTF force-cast it to normal one??? Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/ehci.h12
-rw-r--r--drivers/usb/host/ohci.h12
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index ec0da0343be4..46fa57a520d0 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -677,10 +677,10 @@ static inline unsigned int ehci_readl (const struct ehci_hcd *ehci,
677{ 677{
678#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO 678#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
679 return ehci_big_endian_mmio(ehci) ? 679 return ehci_big_endian_mmio(ehci) ?
680 readl_be((__force u32 *)regs) : 680 readl_be(regs) :
681 readl((__force u32 *)regs); 681 readl(regs);
682#else 682#else
683 return readl((__force u32 *)regs); 683 return readl(regs);
684#endif 684#endif
685} 685}
686 686
@@ -689,10 +689,10 @@ static inline void ehci_writel (const struct ehci_hcd *ehci,
689{ 689{
690#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO 690#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
691 ehci_big_endian_mmio(ehci) ? 691 ehci_big_endian_mmio(ehci) ?
692 writel_be(val, (__force u32 *)regs) : 692 writel_be(val, regs) :
693 writel(val, (__force u32 *)regs); 693 writel(val, regs);
694#else 694#else
695 writel(val, (__force u32 *)regs); 695 writel(val, regs);
696#endif 696#endif
697} 697}
698 698
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index 0dafcda37291..c2b5ecfe5e9f 100644
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -507,10 +507,10 @@ static inline unsigned int _ohci_readl (const struct ohci_hcd *ohci,
507{ 507{
508#ifdef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO 508#ifdef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO
509 return big_endian_mmio(ohci) ? 509 return big_endian_mmio(ohci) ?
510 readl_be ((__force u32 *)regs) : 510 readl_be (regs) :
511 readl ((__force u32 *)regs); 511 readl (regs);
512#else 512#else
513 return readl ((__force u32 *)regs); 513 return readl (regs);
514#endif 514#endif
515} 515}
516 516
@@ -519,10 +519,10 @@ static inline void _ohci_writel (const struct ohci_hcd *ohci,
519{ 519{
520#ifdef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO 520#ifdef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO
521 big_endian_mmio(ohci) ? 521 big_endian_mmio(ohci) ?
522 writel_be (val, (__force u32 *)regs) : 522 writel_be (val, regs) :
523 writel (val, (__force u32 *)regs); 523 writel (val, regs);
524#else 524#else
525 writel (val, (__force u32 *)regs); 525 writel (val, regs);
526#endif 526#endif
527} 527}
528 528