Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68f50e52 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 53ebb3b8

drivers/usb/host/ehci.h

+6 −6
Original line number Diff line number Diff line
@@ -677,10 +677,10 @@ static inline unsigned int ehci_readl (const struct ehci_hcd *ehci, 
{

#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO

	return ehci_big_endian_mmio(ehci) ?

		readl_be((__force u32 *)regs) :

		readl((__force u32 *)regs);

		readl_be(regs) :

		readl(regs);

#else

	return readl((__force u32 *)regs);

	return readl(regs);

#endif

}
@@ -689,10 +689,10 @@ static inline void ehci_writel (const struct ehci_hcd *ehci, 
{

#ifdef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO

	ehci_big_endian_mmio(ehci) ?

		writel_be(val, (__force u32 *)regs) :

		writel(val, (__force u32 *)regs);

		writel_be(val, regs) :

		writel(val, regs);

#else

	writel(val, (__force u32 *)regs);

	writel(val, regs);

#endif

}

drivers/usb/host/ohci.h

+6 −6
Original line number Diff line number Diff line
@@ -507,10 +507,10 @@ static inline unsigned int _ohci_readl (const struct ohci_hcd *ohci, 
{

#ifdef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO

	return big_endian_mmio(ohci) ?

		readl_be ((__force u32 *)regs) :

		readl ((__force u32 *)regs);

		readl_be (regs) :

		readl (regs);

#else

	return readl ((__force u32 *)regs);

	return readl (regs);

#endif

}
@@ -519,10 +519,10 @@ static inline void _ohci_writel (const struct ohci_hcd *ohci, 
{

#ifdef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO

	big_endian_mmio(ohci) ?

		writel_be (val, (__force u32 *)regs) :

		writel (val, (__force u32 *)regs);

		writel_be (val, regs) :

		writel (val, regs);

#else

		writel (val, (__force u32 *)regs);

		writel (val, regs);

#endif

}