linux-kernel - [PATCH] PCI: imx6: Do not output error message when devm_clk_get() failed with -EPROBE

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Tue,  4 Aug 2020 13:38:01 +0800
From:   Anson Huang <Anson.Huang@....com>
To:     hongxing.zhu@....com, l.stach@...gutronix.de,
        lorenzo.pieralisi@....com, robh@...nel.org, bhelgaas@...gle.com,
        shawnguo@...nel.org, s.hauer@...gutronix.de, kernel@...gutronix.de,
        festevam@...il.com, linux-pci@...r.kernel.org,
        linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Cc:     Linux-imx@....com
Subject: [PATCH] PCI: imx6: Do not output error message when devm_clk_get() failed with -EPROBE_DEFER

When devm_clk_get() returns -EPROBE_DEFER, i.MX6 PCI driver should
NOT print error message, just return -EPROBE_DEFER is enough.

Signed-off-by: Anson Huang <Anson.Huang@....com>
---
 drivers/pci/controller/dwc/pci-imx6.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 4e5c379..ee75d35 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -1076,20 +1076,26 @@ static int imx6_pcie_probe(struct platform_device *pdev)
 	/* Fetch clocks */
 	imx6_pcie->pcie_phy = devm_clk_get(dev, "pcie_phy");
 	if (IS_ERR(imx6_pcie->pcie_phy)) {
-		dev_err(dev, "pcie_phy clock source missing or invalid\n");
-		return PTR_ERR(imx6_pcie->pcie_phy);
+		ret = PTR_ERR(imx6_pcie->pcie_phy);
+		if (ret != -EPROBE_DEFER)
+			dev_err(dev, "pcie_phy clock source missing or invalid\n");
+		return ret;
 	}
 
 	imx6_pcie->pcie_bus = devm_clk_get(dev, "pcie_bus");
 	if (IS_ERR(imx6_pcie->pcie_bus)) {
-		dev_err(dev, "pcie_bus clock source missing or invalid\n");
-		return PTR_ERR(imx6_pcie->pcie_bus);
+		ret = PTR_ERR(imx6_pcie->pcie_bus);
+		if (ret != -EPROBE_DEFER)
+			dev_err(dev, "pcie_bus clock source missing or invalid\n");
+		return ret;
 	}
 
 	imx6_pcie->pcie = devm_clk_get(dev, "pcie");
 	if (IS_ERR(imx6_pcie->pcie)) {
-		dev_err(dev, "pcie clock source missing or invalid\n");
-		return PTR_ERR(imx6_pcie->pcie);
+		ret = PTR_ERR(imx6_pcie->pcie);
+		if (ret != -EPROBE_DEFER)
+			dev_err(dev, "pcie clock source missing or invalid\n");
+		return ret;
 	}
 
 	switch (imx6_pcie->drvdata->variant) {
@@ -1097,15 +1103,19 @@ static int imx6_pcie_probe(struct platform_device *pdev)
 		imx6_pcie->pcie_inbound_axi = devm_clk_get(dev,
 							   "pcie_inbound_axi");
 		if (IS_ERR(imx6_pcie->pcie_inbound_axi)) {
-			dev_err(dev, "pcie_inbound_axi clock missing or invalid\n");
-			return PTR_ERR(imx6_pcie->pcie_inbound_axi);
+			ret = PTR_ERR(imx6_pcie->pcie_inbound_axi);
+			if (ret != -EPROBE_DEFER)
+				dev_err(dev, "pcie_inbound_axi clock missing or invalid\n");
+			return ret;
 		}
 		break;
 	case IMX8MQ:
 		imx6_pcie->pcie_aux = devm_clk_get(dev, "pcie_aux");
 		if (IS_ERR(imx6_pcie->pcie_aux)) {
-			dev_err(dev, "pcie_aux clock source missing or invalid\n");
-			return PTR_ERR(imx6_pcie->pcie_aux);
+			ret = PTR_ERR(imx6_pcie->pcie_aux);
+			if (ret != -EPROBE_DEFER)
+				dev_err(dev, "pcie_aux clock source missing or invalid\n");
+			return ret;
 		}
 		/* fall through */
 	case IMX7D:
-- 
2.7.4