Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 102263
b: refs/heads/master
c: 563f119
h: refs/heads/master
i:
  102261: c365542
  102259: 5cfe674
  102255: 1094857
v: v3
  • Loading branch information
Kenji Kaneshige authored and Jesse Barnes committed Jun 25, 2008
1 parent 823755f commit c68ed79
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 66618bad123494beb30c0d590460e972e5b0977e
refs/heads/master: 563f119080b505076429b47722fbf6374b546fa7
4 changes: 2 additions & 2 deletions trunk/drivers/pci/hotplug/pciehp_hpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ static inline void pciehp_free_irq(struct controller *ctrl)
free_irq(ctrl->pci_dev->irq, ctrl);
}

static inline int pcie_poll_cmd(struct controller *ctrl)
static int pcie_poll_cmd(struct controller *ctrl)
{
u16 slot_status;
int timeout = 1000;
Expand All @@ -271,7 +271,7 @@ static inline int pcie_poll_cmd(struct controller *ctrl)
return 0; /* timeout */
}

static inline void pcie_wait_cmd(struct controller *ctrl, int poll)
static void pcie_wait_cmd(struct controller *ctrl, int poll)
{
unsigned int msecs = pciehp_poll_mode ? 2500 : 1000;
unsigned long timeout = msecs_to_jiffies(msecs);
Expand Down

0 comments on commit c68ed79

Please sign in to comment.