Commit 41ac424a authored by Jim Quinlan's avatar Jim Quinlan Committed by Bjorn Helgaas
Browse files

PCI: brcmstb: Fix function return value handling 

Do at least a dev_err() on some calls to reset_control_rearm() and
brcm_phy_stop().  In some cases it may not make sense to return this error
value "above" as doing so will cause more trouble than is warranted.

Link: https://lore.kernel.org/r/20220106160332.2143-2-jim2101024@gmail.com


Signed-off-by: default avatarJim Quinlan <jim2101024@gmail.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent 09a710d9

drivers/pci/controller/pcie-brcmstb.c

+22 −6
Original line number Diff line number Diff line
@@ -1155,13 +1155,25 @@ static int brcm_pcie_suspend(struct device *dev) 
	int ret;



	brcm_pcie_turn_off(pcie);

	ret = brcm_phy_stop(pcie);

	reset_control_rearm(pcie->rescal);

	clk_disable_unprepare(pcie->clk);

	/*

	 * If brcm_phy_stop() returns an error, just dev_err(). If we

	 * return the error it will cause the suspend to fail and this is a

	 * forgivable offense that will probably be erased on resume.

	 */

	if (brcm_phy_stop(pcie))

		dev_err(dev, "Could not stop phy for suspend\n");



	ret = reset_control_rearm(pcie->rescal);

	if (ret) {

		dev_err(dev, "Could not rearm rescal reset\n");

		return ret;

	}



	clk_disable_unprepare(pcie->clk);



	return 0;

}



static int brcm_pcie_resume(struct device *dev)

{

	struct brcm_pcie *pcie = dev_get_drvdata(dev);
@@ -1170,7 +1182,9 @@ static int brcm_pcie_resume(struct device *dev) 
	int ret;



	base = pcie->base;

	clk_prepare_enable(pcie->clk);

	ret = clk_prepare_enable(pcie->clk);

	if (ret)

		return ret;



	ret = reset_control_reset(pcie->rescal);

	if (ret)
@@ -1211,8 +1225,10 @@ static void __brcm_pcie_remove(struct brcm_pcie *pcie) 
{

	brcm_msi_remove(pcie);

	brcm_pcie_turn_off(pcie);

	brcm_phy_stop(pcie);

	reset_control_rearm(pcie->rescal);

	if (brcm_phy_stop(pcie))

		dev_err(pcie->dev, "Could not stop phy\n");

	if (reset_control_rearm(pcie->rescal))

		dev_err(pcie->dev, "Could not rearm rescal reset\n");

	clk_disable_unprepare(pcie->clk);

}