PCI: imx6: Do not output error message when devm_clk_get() failed with -EPROBE_DEFER
Subsystems (4)
PATCH v2 1/1 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, use dev_err_probe() to handle it.
Signed-off-by Anson Huang <[email protected]>
--- drivers/pci/controller/dwc/pci-imx6.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-)
drivers/pci/controller/dwc/pci-imx6.c +15 -20
@@ -1073,38 +1073,33 @@ 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); - } +if (IS_ERR (imx6_pcie->pcie_phy)) +return dev_err_probe (dev,PTR_ERR (imx6_pcie->pcie_phy), +"pcie_phy clock source missing or invalid\n" ); 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); - } +if (IS_ERR (imx6_pcie->pcie_bus)) +return dev_err_probe (dev,PTR_ERR (imx6_pcie->pcie_bus), +"pcie_bus clock source missing or invalid\n" ); 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); - } +if (IS_ERR (imx6_pcie->pcie)) +return dev_err_probe (dev,PTR_ERR (imx6_pcie->pcie), +"pcie clock source missing or invalid\n" );switch (imx6_pcie->drvdata->variant) {case IMX6SX : 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); - } +if (IS_ERR (imx6_pcie->pcie_inbound_axi)) +return dev_err_probe (dev,PTR_ERR (imx6_pcie->pcie_inbound_axi), +"pcie_inbound_axi clock missing or invalid\n" );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); - } +if (IS_ERR (imx6_pcie->pcie_aux)) +return dev_err_probe (dev,PTR_ERR (imx6_pcie->pcie_aux), +"pcie_aux clock source missing or invalid\n" );/* fall through */ case IMX7D :if (dbi_base->start ==IMX8MQ_PCIE2_BASE_ADDR )
Signature · 1 line
2.7.4
Am Dienstag, den 11.08.2020, 09:29 +0800 schrieb Anson Huang:
Quoted 4 lines
When
devm_clk_get()returns -EPROBE_DEFER, i.MX6 PCI driver should NOT print error message, usedev_err_probe()to handle it.Signed-off-by Anson Huang <[email protected]>
Reviewed-by Lucas Stach <[email protected]>
Quoted 62 lines
--- drivers/pci/controller/dwc/pci-imx6.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-)drivers/pci/controller/dwc/pci-imx6.c +15
-20@@ -1073,38 +1073,33 @@ 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); - } +if (IS_ERR (imx6_pcie->pcie_phy)) +return dev_err_probe (dev,PTR_ERR (imx6_pcie->pcie_phy), +"pcie_phy clock source missing or invalid\n" ); 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); - } +if (IS_ERR (imx6_pcie->pcie_bus)) +return dev_err_probe (dev,PTR_ERR (imx6_pcie->pcie_bus), +"pcie_bus clock source missing or invalid\n" ); 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); - } +if (IS_ERR (imx6_pcie->pcie)) +return dev_err_probe (dev,PTR_ERR (imx6_pcie->pcie), +"pcie clock source missing or invalid\n" );switch (imx6_pcie->drvdata->variant) {case IMX6SX : 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); - } +if (IS_ERR (imx6_pcie->pcie_inbound_axi)) +return dev_err_probe (dev,PTR_ERR (imx6_pcie->pcie_inbound_axi), +"pcie_inbound_axi clock missing or invalid\n" );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); - } +if (IS_ERR (imx6_pcie->pcie_aux)) +return dev_err_probe (dev,PTR_ERR (imx6_pcie->pcie_aux), +"pcie_aux clock source missing or invalid\n" );/* fall through */ case IMX7D :if (dbi_base->start ==IMX8MQ_PCIE2_BASE_ADDR )
Lorenzo Pieralisi
AppliedQuoted 7 lines · Anson Huang
When
devm_clk_get()returns -EPROBE_DEFER, i.MX6 PCI driver should NOT print error message, usedev_err_probe()to handle it.Signed-off-by Anson Huang <[email protected]>--- drivers/pci/controller/dwc/pci-imx6.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-)
Applied to pci/imx6, thanks.
Lorenzo
Quoted 61 lines
drivers/pci/controller/dwc/pci-imx6.c +15
-20@@ -1073,38 +1073,33 @@ 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); - } +if (IS_ERR (imx6_pcie->pcie_phy)) +return dev_err_probe (dev,PTR_ERR (imx6_pcie->pcie_phy), +"pcie_phy clock source missing or invalid\n" ); 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); - } +if (IS_ERR (imx6_pcie->pcie_bus)) +return dev_err_probe (dev,PTR_ERR (imx6_pcie->pcie_bus), +"pcie_bus clock source missing or invalid\n" ); 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); - } +if (IS_ERR (imx6_pcie->pcie)) +return dev_err_probe (dev,PTR_ERR (imx6_pcie->pcie), +"pcie clock source missing or invalid\n" );switch (imx6_pcie->drvdata->variant) {case IMX6SX : 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); - } +if (IS_ERR (imx6_pcie->pcie_inbound_axi)) +return dev_err_probe (dev,PTR_ERR (imx6_pcie->pcie_inbound_axi), +"pcie_inbound_axi clock missing or invalid\n" );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); - } +if (IS_ERR (imx6_pcie->pcie_aux)) +return dev_err_probe (dev,PTR_ERR (imx6_pcie->pcie_aux), +"pcie_aux clock source missing or invalid\n" );/* fall through */ case IMX7D :if (dbi_base->start ==IMX8MQ_PCIE2_BASE_ADDR )Signature · 1 line
2.7.4
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel