2020-08-04 05:43:38

by Anson Huang

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 <[email protected]>
---
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

2020-08-05 05:46:24

by Richard Zhu

Subject: RE: [PATCH] PCI: imx6: Do not output error message when devm_clk_get() failed with -EPROBE_DEFER

> -----Original Message-----
> From: Anson Huang <[email protected]>
> Sent: 2020??8??4?? 13:38
> To: Richard Zhu <[email protected]>; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; [email protected]
> Cc: dl-linux-imx <[email protected]>
> 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 <[email protected]>

I'm fine with these changes. Thanks.
Reviewed-by: Richard Zhu <[email protected]>

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

2020-08-10 09:03:53

by Lucas Stach

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.

Regards,
Lucas

> Signed-off-by: Anson Huang <[email protected]>
> ---
> 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:

2020-08-11 01:38:06

by Anson Huang

Subject: RE: [PATCH] PCI: imx6: Do not output error message when devm_clk_get() failed with -EPROBE_DEFER

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