Skip to contentSkip to conversation

pciehp: Make check_link_active() non-static

RFC PATCH Superseded Rajat Jain 1 participant 1 message Nov 19, 2013 PCI

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Rajat Jain

author
#0 lore raw

RFC PATCH 1/4 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.

---
 drivers/pci/hotplug/pciehp.h     |    1 +
 drivers/pci/hotplug/pciehp_hpc.c |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/pci/hotplug/pciehp.h +1 -0
index 541bbe6..fc322ed 100644
@@ -154,6 +154,7 @@ void pciehp_green_led_on(struct slot *slot);
 void pciehp_green_led_off(struct slot *slot);
 void pciehp_green_led_blink(struct slot *slot);
 int pciehp_check_link_status(struct controller *ctrl);
+bool pciehp_check_link_active(struct controller *ctrl);
 void pciehp_release_ctrl(struct controller *ctrl);
 int pciehp_reset_slot(struct slot *slot, int probe);
 
drivers/pci/hotplug/pciehp_hpc.c +3 -3
index 51f56ef..3a5eee7 100644
@@ -241,7 +241,7 @@ static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
 	return retval;
 }
 
-static bool check_link_active(struct controller *ctrl)
+bool pciehp_check_link_active(struct controller *ctrl)
 {
 	bool ret = false;
 	u16 lnk_status;
@@ -261,12 +261,12 @@ static void __pcie_wait_link_active(struct controller *ctrl, bool active)
 {
 	int timeout = 1000;
 
-	if (check_link_active(ctrl) = active)
+	if (pciehp_check_link_active(ctrl) = active)
 		return;
 	while (timeout > 0) {
 		msleep(10);
 		timeout -= 10;
-		if (check_link_active(ctrl) = active)
+		if (pciehp_check_link_active(ctrl) = active)
 			return;
 	}
 	ctrl_dbg(ctrl, "Data Link Layer Link Active not %s in 1000 msec\n",
Signature · 1 line
1.7.9.5