Am Sonntag, den 31.03.2019, 21:25 -0700 schrieb Andrey Smirnov: > All calls to imx6_pcie_wait_for_link() share the same error path and > the state of PHY debug registers will already be printed there.
With this change we can drop imx6_pcie_wait_for_link altogether, as it's now just wrapper around dw_pcie_wait_for_link that pulls out the dw_pcie struct from imx6_pcie. Both callers have dw_pcie already available, so there is no point in keeping this function. Regards, Lucas > Cc: Lorenzo Pieralisi <[email protected]> > > Cc: Bjorn Helgaas <[email protected]> > > Cc: Fabio Estevam <[email protected]> > > Cc: Chris Healy <[email protected]> > > Cc: Lucas Stach <[email protected]> > > Cc: Leonard Crestez <[email protected]> > > Cc: "A.s. Dong" <[email protected]> > > Cc: Richard Zhu <[email protected]> > Cc: [email protected] > Cc: [email protected] > Cc: [email protected] > Cc: [email protected] > > Signed-off-by: Andrey Smirnov <[email protected]> > --- > drivers/pci/controller/dwc/pci-imx6.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c > b/drivers/pci/controller/dwc/pci-imx6.c > index fb0b29e5b1f0..7582d0b2fbe7 100644 > --- a/drivers/pci/controller/dwc/pci-imx6.c > +++ b/drivers/pci/controller/dwc/pci-imx6.c > @@ -726,16 +726,9 @@ static int imx6_setup_phy_mpll(struct imx6_pcie > *imx6_pcie) > static int imx6_pcie_wait_for_link(struct imx6_pcie *imx6_pcie) > { > > struct dw_pcie *pci = imx6_pcie->pci; > > - struct device *dev = pci->dev; > > > /* check if the link is up or not */ > > - if (!dw_pcie_wait_for_link(pci)) > > - return 0; > - > > - dev_dbg(dev, "DEBUG_R0: 0x%08x, DEBUG_R1: 0x%08x\n", > > - dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R0), > > - dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R1)); > > - return -ETIMEDOUT; > > + return dw_pcie_wait_for_link(pci); > } > > static int imx6_pcie_wait_for_speed_change(struct imx6_pcie *imx6_pcie)
