mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
PCI: pciehp: Make check_link_active() non-static
check_link_active() functionality needs to be used by subsequent patches (that introduce link state change based hotplug). Thus make the function non-static, and rename it to pciehp_check_link_active() so as to be consistent with other non-static functions. Signed-off-by: Rajat Jain <rajatxjain@gmail.com> Signed-off-by: Rajat Jain <rajatjain@juniper.net> Signed-off-by: Guenter Roeck <groeck@juniper.net> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
parent
38dbfb59d1
commit
4703389f7d
2 changed files with 4 additions and 3 deletions
|
@ -153,6 +153,7 @@ void pciehp_green_led_on(struct slot *slot);
|
||||||
void pciehp_green_led_off(struct slot *slot);
|
void pciehp_green_led_off(struct slot *slot);
|
||||||
void pciehp_green_led_blink(struct slot *slot);
|
void pciehp_green_led_blink(struct slot *slot);
|
||||||
int pciehp_check_link_status(struct controller *ctrl);
|
int pciehp_check_link_status(struct controller *ctrl);
|
||||||
|
bool pciehp_check_link_active(struct controller *ctrl);
|
||||||
void pciehp_release_ctrl(struct controller *ctrl);
|
void pciehp_release_ctrl(struct controller *ctrl);
|
||||||
int pciehp_reset_slot(struct slot *slot, int probe);
|
int pciehp_reset_slot(struct slot *slot, int probe);
|
||||||
|
|
||||||
|
|
|
@ -206,7 +206,7 @@ static void pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
|
||||||
mutex_unlock(&ctrl->ctrl_lock);
|
mutex_unlock(&ctrl->ctrl_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool check_link_active(struct controller *ctrl)
|
bool pciehp_check_link_active(struct controller *ctrl)
|
||||||
{
|
{
|
||||||
struct pci_dev *pdev = ctrl_dev(ctrl);
|
struct pci_dev *pdev = ctrl_dev(ctrl);
|
||||||
u16 lnk_status;
|
u16 lnk_status;
|
||||||
|
@ -225,12 +225,12 @@ static void __pcie_wait_link_active(struct controller *ctrl, bool active)
|
||||||
{
|
{
|
||||||
int timeout = 1000;
|
int timeout = 1000;
|
||||||
|
|
||||||
if (check_link_active(ctrl) == active)
|
if (pciehp_check_link_active(ctrl) == active)
|
||||||
return;
|
return;
|
||||||
while (timeout > 0) {
|
while (timeout > 0) {
|
||||||
msleep(10);
|
msleep(10);
|
||||||
timeout -= 10;
|
timeout -= 10;
|
||||||
if (check_link_active(ctrl) == active)
|
if (pciehp_check_link_active(ctrl) == active)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ctrl_dbg(ctrl, "Data Link Layer Link Active not %s in 1000 msec\n",
|
ctrl_dbg(ctrl, "Data Link Layer Link Active not %s in 1000 msec\n",
|
||||||
|
|
Loading…
Reference in a new issue