diff mbox

PCI: dwc: fix ptr_ret.cocci warnings

Message ID 20170204013531.GA26132@lkp-wsm-ep2
State Accepted
Headers show

Commit Message

kbuild test robot Feb. 4, 2017, 1:35 a.m. UTC 
drivers/pci/dwc/pcie-qcom.c:215:1-3: WARNING: PTR_ERR_OR_ZERO can be used
drivers/pci/dwc/pcie-qcom.c:247:1-3: WARNING: PTR_ERR_OR_ZERO can be used
drivers/pci/dwc/pcie-qcom.c:481:1-3: WARNING: PTR_ERR_OR_ZERO can be used


 Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR

Generated by: scripts/coccinelle/api/ptr_ret.cocci

CC: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
---

 pcie-qcom.c |   15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

Comments

Bjorn Helgaas Feb. 7, 2017, 11:03 p.m. UTC | #1 
On Sat, Feb 04, 2017 at 09:35:32AM +0800, kbuild test robot wrote:
> drivers/pci/dwc/pcie-qcom.c:215:1-3: WARNING: PTR_ERR_OR_ZERO can be used
> drivers/pci/dwc/pcie-qcom.c:247:1-3: WARNING: PTR_ERR_OR_ZERO can be used
> drivers/pci/dwc/pcie-qcom.c:481:1-3: WARNING: PTR_ERR_OR_ZERO can be used
> 
> 
>  Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR
> 
> Generated by: scripts/coccinelle/api/ptr_ret.cocci
> 
> CC: Kishon Vijay Abraham I <kishon@ti.com>
> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>

Applied to pci/host-designware for v4.11, thanks!

> ---
> 
>  pcie-qcom.c |   15 +++------------
>  1 file changed, 3 insertions(+), 12 deletions(-)
> 
> --- a/drivers/pci/dwc/pcie-qcom.c
> +++ b/drivers/pci/dwc/pcie-qcom.c
> @@ -212,10 +212,7 @@ static int qcom_pcie_get_resources_v0(st
>  		return PTR_ERR(res->por_reset);
>  
>  	res->phy_reset = devm_reset_control_get(dev, "phy");
> -	if (IS_ERR(res->phy_reset))
> -		return PTR_ERR(res->phy_reset);
> -
> -	return 0;
> +	return PTR_ERR_OR_ZERO(res->phy_reset);
>  }
>  
>  static int qcom_pcie_get_resources_v1(struct qcom_pcie *pcie)
> @@ -244,10 +241,7 @@ static int qcom_pcie_get_resources_v1(st
>  		return PTR_ERR(res->slave_bus);
>  
>  	res->core = devm_reset_control_get(dev, "core");
> -	if (IS_ERR(res->core))
> -		return PTR_ERR(res->core);
> -
> -	return 0;
> +	return PTR_ERR_OR_ZERO(res->core);
>  }
>  
>  static void qcom_pcie_deinit_v0(struct qcom_pcie *pcie)
> @@ -478,10 +472,7 @@ static int qcom_pcie_get_resources_v2(st
>  		return PTR_ERR(res->slave_clk);
>  
>  	res->pipe_clk = devm_clk_get(dev, "pipe");
> -	if (IS_ERR(res->pipe_clk))
> -		return PTR_ERR(res->pipe_clk);
> -
> -	return 0;
> +	return PTR_ERR_OR_ZERO(res->pipe_clk);
>  }
>  
>  static int qcom_pcie_init_v2(struct qcom_pcie *pcie)
diff mbox

Patch

--- a/drivers/pci/dwc/pcie-qcom.c
+++ b/drivers/pci/dwc/pcie-qcom.c
@@ -212,10 +212,7 @@  static int qcom_pcie_get_resources_v0(st
 		return PTR_ERR(res->por_reset);
 
 	res->phy_reset = devm_reset_control_get(dev, "phy");
-	if (IS_ERR(res->phy_reset))
-		return PTR_ERR(res->phy_reset);
-
-	return 0;
+	return PTR_ERR_OR_ZERO(res->phy_reset);
 }
 
 static int qcom_pcie_get_resources_v1(struct qcom_pcie *pcie)
@@ -244,10 +241,7 @@  static int qcom_pcie_get_resources_v1(st
 		return PTR_ERR(res->slave_bus);
 
 	res->core = devm_reset_control_get(dev, "core");
-	if (IS_ERR(res->core))
-		return PTR_ERR(res->core);
-
-	return 0;
+	return PTR_ERR_OR_ZERO(res->core);
 }
 
 static void qcom_pcie_deinit_v0(struct qcom_pcie *pcie)
@@ -478,10 +472,7 @@  static int qcom_pcie_get_resources_v2(st
 		return PTR_ERR(res->slave_clk);
 
 	res->pipe_clk = devm_clk_get(dev, "pipe");
-	if (IS_ERR(res->pipe_clk))
-		return PTR_ERR(res->pipe_clk);
-
-	return 0;
+	return PTR_ERR_OR_ZERO(res->pipe_clk);
 }
 
 static int qcom_pcie_init_v2(struct qcom_pcie *pcie)