diff options
-rw-r--r-- | drivers/pci/hotplug/pciehp.h | 1 | ||||
-rw-r--r-- | drivers/pci/hotplug/pciehp_hpc.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index 88b37cad4b35..f9524592da0f 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h | |||
@@ -153,6 +153,7 @@ void pciehp_green_led_on(struct slot *slot); | |||
153 | void pciehp_green_led_off(struct slot *slot); | 153 | void pciehp_green_led_off(struct slot *slot); |
154 | void pciehp_green_led_blink(struct slot *slot); | 154 | void pciehp_green_led_blink(struct slot *slot); |
155 | int pciehp_check_link_status(struct controller *ctrl); | 155 | int pciehp_check_link_status(struct controller *ctrl); |
156 | bool pciehp_check_link_active(struct controller *ctrl); | ||
156 | void pciehp_release_ctrl(struct controller *ctrl); | 157 | void pciehp_release_ctrl(struct controller *ctrl); |
157 | int pciehp_reset_slot(struct slot *slot, int probe); | 158 | int pciehp_reset_slot(struct slot *slot, int probe); |
158 | 159 | ||
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 14acfccb7670..aed6ab43cc13 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c | |||
@@ -206,7 +206,7 @@ static void pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask) | |||
206 | mutex_unlock(&ctrl->ctrl_lock); | 206 | mutex_unlock(&ctrl->ctrl_lock); |
207 | } | 207 | } |
208 | 208 | ||
209 | static bool check_link_active(struct controller *ctrl) | 209 | bool pciehp_check_link_active(struct controller *ctrl) |
210 | { | 210 | { |
211 | struct pci_dev *pdev = ctrl_dev(ctrl); | 211 | struct pci_dev *pdev = ctrl_dev(ctrl); |
212 | u16 lnk_status; | 212 | u16 lnk_status; |
@@ -225,12 +225,12 @@ static void __pcie_wait_link_active(struct controller *ctrl, bool active) | |||
225 | { | 225 | { |
226 | int timeout = 1000; | 226 | int timeout = 1000; |
227 | 227 | ||
228 | if (check_link_active(ctrl) == active) | 228 | if (pciehp_check_link_active(ctrl) == active) |
229 | return; | 229 | return; |
230 | while (timeout > 0) { | 230 | while (timeout > 0) { |
231 | msleep(10); | 231 | msleep(10); |
232 | timeout -= 10; | 232 | timeout -= 10; |
233 | if (check_link_active(ctrl) == active) | 233 | if (pciehp_check_link_active(ctrl) == active) |
234 | return; | 234 | return; |
235 | } | 235 | } |
236 | ctrl_dbg(ctrl, "Data Link Layer Link Active not %s in 1000 msec\n", | 236 | ctrl_dbg(ctrl, "Data Link Layer Link Active not %s in 1000 msec\n", |