* [PATCH] PCI: imx6: Do not output error message when devm_clk_get() failed with -EPROBE_DEFER
@ 2020-08-04 5:38 Anson Huang
2020-08-05 5:45 ` Richard Zhu
2020-08-10 9:02 ` Lucas Stach
0 siblings, 2 replies; 4+ messages in thread
From: Anson Huang @ 2020-08-04 5:38 UTC (permalink / raw)
To: hongxing.zhu, l.stach, lorenzo.pieralisi, robh, bhelgaas,
shawnguo, s.hauer, kernel, festevam, linux-pci, linux-arm-kernel,
linux-kernel
Cc: Linux-imx
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@nxp.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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH] PCI: imx6: Do not output error message when devm_clk_get() failed with -EPROBE_DEFER
2020-08-04 5:38 [PATCH] PCI: imx6: Do not output error message when devm_clk_get() failed with -EPROBE_DEFER Anson Huang
@ 2020-08-05 5:45 ` Richard Zhu
2020-08-10 9:02 ` Lucas Stach
1 sibling, 0 replies; 4+ messages in thread
From: Richard Zhu @ 2020-08-05 5:45 UTC (permalink / raw)
To: Anson Huang, l.stach, lorenzo.pieralisi, robh, bhelgaas,
shawnguo, s.hauer, kernel, festevam, linux-pci, linux-arm-kernel,
linux-kernel
Cc: dl-linux-imx
> -----Original Message-----
> From: Anson Huang <Anson.Huang@nxp.com>
> Sent: 2020年8月4日 13:38
> To: Richard Zhu <hongxing.zhu@nxp.com>; l.stach@pengutronix.de;
> lorenzo.pieralisi@arm.com; robh@kernel.org; bhelgaas@google.com;
> shawnguo@kernel.org; s.hauer@pengutronix.de; kernel@pengutronix.de;
> festevam@gmail.com; linux-pci@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org
> Cc: dl-linux-imx <linux-imx@nxp.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@nxp.com>
I'm fine with these changes. Thanks.
Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Best Regards
Richard Zhu
> ---
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] PCI: imx6: Do not output error message when devm_clk_get() failed with -EPROBE_DEFER
2020-08-04 5:38 [PATCH] PCI: imx6: Do not output error message when devm_clk_get() failed with -EPROBE_DEFER Anson Huang
2020-08-05 5:45 ` Richard Zhu
@ 2020-08-10 9:02 ` Lucas Stach
2020-08-11 1:36 ` Anson Huang
1 sibling, 1 reply; 4+ messages in thread
From: Lucas Stach @ 2020-08-10 9:02 UTC (permalink / raw)
To: Anson Huang, hongxing.zhu, lorenzo.pieralisi, robh, bhelgaas,
shawnguo, s.hauer, kernel, festevam, linux-pci, linux-arm-kernel,
linux-kernel
Cc: Linux-imx
Am Dienstag, den 04.08.2020, 13:38 +0800 schrieb Anson Huang:
> When devm_clk_get() returns -EPROBE_DEFER, i.MX6 PCI driver should
> NOT print error message, just return -EPROBE_DEFER is enough.
The reasoning behind this change is fine, but I think we should use the
recently merged dev_err_probe() helper to achieve the same goal.
Regards,
Lucas
> Signed-off-by: Anson Huang <Anson.Huang@nxp.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:
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH] PCI: imx6: Do not output error message when devm_clk_get() failed with -EPROBE_DEFER
2020-08-10 9:02 ` Lucas Stach
@ 2020-08-11 1:36 ` Anson Huang
0 siblings, 0 replies; 4+ messages in thread
From: Anson Huang @ 2020-08-11 1:36 UTC (permalink / raw)
To: Lucas Stach, Richard Zhu, lorenzo.pieralisi, robh, bhelgaas,
shawnguo, s.hauer, kernel, festevam, linux-pci, linux-arm-kernel,
linux-kernel
Cc: dl-linux-imx
Hi, Lucas
> Subject: Re: [PATCH] PCI: imx6: Do not output error message when
> devm_clk_get() failed with -EPROBE_DEFER
>
> Am Dienstag, den 04.08.2020, 13:38 +0800 schrieb Anson Huang:
> > When devm_clk_get() returns -EPROBE_DEFER, i.MX6 PCI driver should NOT
> > print error message, just return -EPROBE_DEFER is enough.
>
> The reasoning behind this change is fine, but I think we should use the recently
> merged dev_err_probe() helper to achieve the same goal.
Ah, yes, just notice this new API added, please help review V2, thanks.
Anson
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-08-11 1:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-04 5:38 [PATCH] PCI: imx6: Do not output error message when devm_clk_get() failed with -EPROBE_DEFER Anson Huang
2020-08-05 5:45 ` Richard Zhu
2020-08-10 9:02 ` Lucas Stach
2020-08-11 1:36 ` Anson Huang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).