Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 44777
b: refs/heads/master
c: abc9404
h: refs/heads/master
i:
  44775: a4b398c
v: v3
  • Loading branch information
Jeff Garzik authored and Greg Kroah-Hartman committed Dec 20, 2006
1 parent 63dc444 commit 2b44273
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: c2585d962572744271a7e254d48c747727441936
refs/heads/master: abc9404bb0bcfa8677ab5978b2c8b60ab5ef7536
6 changes: 3 additions & 3 deletions trunk/drivers/usb/host/ohci.h
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ static inline void disable (struct ohci_hcd *ohci)
#define FIT (1 << 31)
#define LSTHRESH 0x628 /* lowspeed bit threshold */

static void periodic_reinit (struct ohci_hcd *ohci)
static inline void periodic_reinit (struct ohci_hcd *ohci)
{
u32 fi = ohci->fminterval & 0x03fff;
u32 fit = ohci_readl(ohci, &ohci->regs->fminterval) & FIT;
Expand All @@ -626,11 +626,11 @@ static void periodic_reinit (struct ohci_hcd *ohci)
temp = ohci_readl (hc, &hc->regs->roothub.register); \
temp; })

static u32 roothub_a (struct ohci_hcd *hc)
static inline u32 roothub_a (struct ohci_hcd *hc)
{ return read_roothub (hc, a, 0xfc0fe000); }
static inline u32 roothub_b (struct ohci_hcd *hc)
{ return ohci_readl (hc, &hc->regs->roothub.b); }
static inline u32 roothub_status (struct ohci_hcd *hc)
{ return ohci_readl (hc, &hc->regs->roothub.status); }
static u32 roothub_portstatus (struct ohci_hcd *hc, int i)
static inline u32 roothub_portstatus (struct ohci_hcd *hc, int i)
{ return read_roothub (hc, portstatus [i], 0xffe0fce0); }

0 comments on commit 2b44273

Please sign in to comment.