Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 47273
b: refs/heads/master
c: 68f50e5
h: refs/heads/master
i:
  47271: 9cfa89a
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed Feb 9, 2007
1 parent e7a5cea commit 81b46ed
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 53ebb3b8264a77b6214f7a405300de8c24a12554
refs/heads/master: 68f50e52554a0a55dfe2e3fdf659ee0569d73c3f
12 changes: 6 additions & 6 deletions trunk/drivers/usb/host/ehci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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
}

Expand Down
12 changes: 6 additions & 6 deletions trunk/drivers/usb/host/ohci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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
}

Expand Down

0 comments on commit 81b46ed

Please sign in to comment.