Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e2ce405 authored by Yinghai Lu's avatar Yinghai Lu Committed by Jesse Barnes
Browse files

PCI: pciehp: make check_link_active more helpful 



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: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 2f5d8e4f

drivers/pci/hotplug/pciehp_hpc.c

+12 −5
Original line number Diff line number Diff line
@@ -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)