Skip to content

Commit

Permalink
PCI: pciehp: make check_link_active more helpful
Browse files Browse the repository at this point in the history
A few changes:
  - remove the 'inline' and let the complier decide
  - return a bool to indicate whether the link was active
  - add a debug message to indicate link state when it beocmes active

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  • Loading branch information
Yinghai Lu authored and Jesse Barnes committed Feb 14, 2012
1 parent 2f5d8e4 commit 4e2ce40
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions drivers/pci/hotplug/pciehp_hpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -241,13 +241,20 @@ static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
return retval;
}

static inline int check_link_active(struct controller *ctrl)
static bool check_link_active(struct controller *ctrl)
{
u16 link_status;
bool ret = false;
u16 lnk_status;

if (pciehp_readw(ctrl, PCI_EXP_LNKSTA, &link_status))
return 0;
return !!(link_status & PCI_EXP_LNKSTA_DLLLA);
if (pciehp_readw(ctrl, PCI_EXP_LNKSTA, &lnk_status))
return ret;

ret = !!(lnk_status & PCI_EXP_LNKSTA_DLLLA);

if (ret)
ctrl_dbg(ctrl, "%s: lnk_status = %x\n", __func__, lnk_status);

return ret;
}

static void pcie_wait_link_active(struct controller *ctrl)
Expand Down

0 comments on commit 4e2ce40

Please sign in to comment.