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

Commit e77b8216 authored by Keith Busch's avatar Keith Busch Committed by Bjorn Helgaas
Browse files

PCI/DPC: Remove indirection waiting for inactive link 



Simplify waiting for the contained link to become inactive, removing the
indirection to a unnecessary DPC-specific handler.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarSinan Kaya <okaya@kernel.org>
Reviewed-by: default avatarOza Pawandeep <poza@codeaurora.org>
parent 738c4e41

drivers/pci/pcie/dpc.c

+2 −8
Original line number Diff line number Diff line
@@ -64,18 +64,12 @@ static int dpc_wait_rp_inactive(struct dpc_dev *dpc) 
	return 0;

}



static void dpc_wait_link_inactive(struct dpc_dev *dpc)

{

	struct pci_dev *pdev = dpc->dev->port;



	pcie_wait_for_link(pdev, false);

}



static pci_ers_result_t dpc_reset_link(struct pci_dev *pdev)

{

	struct dpc_dev *dpc;

	struct pcie_device *pciedev;

	struct device *devdpc;



	u16 cap;



	/*
@@ -91,7 +85,7 @@ static pci_ers_result_t dpc_reset_link(struct pci_dev *pdev) 
	 * Wait until the Link is inactive, then clear DPC Trigger Status

	 * to allow the Port to leave DPC.

	 */

	dpc_wait_link_inactive(dpc);

	pcie_wait_for_link(pdev, false);



	if (dpc->rp_extensions && dpc_wait_rp_inactive(dpc))

		return PCI_ERS_RESULT_DISCONNECT;