RE: [PATCH] PCI: fix ptr_ret.cocci warnings

[Songxiaowei (Kirin_DRV)]

That's OK, and thank a lot.

> -----Original Message-----
> From: Lorenzo Pieralisi [mailto:lorenzo.pieralisi@xxxxxxx]
> Sent: Tuesday, September 18, 2018 10:21 PM
> To: kbuild test robot <fengguang.wu@xxxxxxxxx>; Songxiaowei (Kirin_DRV)
> <songxiaowei@xxxxxxxxxxxxx>; Wangbinghui (Biggio, Kirin_DRV)
> <wangbinghui@xxxxxxxxxxxxx>
> Cc: Shawn Lin <shawn.lin@xxxxxxxxxxxxxx>; kbuild-all@xxxxxx;
> linux-kernel@xxxxxxxxxxxxxxx; Bjorn Helgaas <helgaas@xxxxxxxxxx>
> Subject: Re: [PATCH] PCI: fix ptr_ret.cocci warnings
> 
> On Fri, Jul 20, 2018 at 07:42:43AM +0800, kbuild test robot wrote:
> > From: kbuild test robot <fengguang.wu@xxxxxxxxx>
> >
> > drivers/pci/controller/dwc/pcie-kirin.c:141:1-3: WARNING:
> > PTR_ERR_OR_ZERO can be used
> > drivers/pci/controller/dwc/pcie-kirin.c:177: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
> >
> > Fixes: 6e0832fa432e ("PCI: Collect all native drivers under
> > drivers/pci/controller/")
> > CC: Shawn Lin <shawn.lin@xxxxxxxxxxxxxx>
> > Signed-off-by: kbuild test robot <fengguang.wu@xxxxxxxxx>
> > ---
> >
> >  pcie-kirin.c |   10 ++--------
> >  1 file changed, 2 insertions(+), 8 deletions(-)
> 
> Xiaowei, Binghui,
> 
> are you OK with this change ? I will remove the Fixes: tag from the patch.
> 
> Let me know, thanks.
> 
> Lorenzo
> 
> > --- a/drivers/pci/controller/dwc/pcie-kirin.c
> > +++ b/drivers/pci/controller/dwc/pcie-kirin.c
> > @@ -138,10 +138,7 @@ static long kirin_pcie_get_clk(struct ki
> >  		return PTR_ERR(kirin_pcie->apb_sys_clk);
> >
> >  	kirin_pcie->pcie_aclk = devm_clk_get(dev, "pcie_aclk");
> > -	if (IS_ERR(kirin_pcie->pcie_aclk))
> > -		return PTR_ERR(kirin_pcie->pcie_aclk);
> > -
> > -	return 0;
> > +	return PTR_ERR_OR_ZERO(kirin_pcie->pcie_aclk);
> >  }
> >
> >  static long kirin_pcie_get_resource(struct kirin_pcie *kirin_pcie, @@
> > -174,10 +171,7 @@ static long kirin_pcie_get_resource(stru
> >
> >  	kirin_pcie->sysctrl =
> >  		syscon_regmap_lookup_by_compatible("hisilicon,hi3660-sctrl");
> > -	if (IS_ERR(kirin_pcie->sysctrl))
> > -		return PTR_ERR(kirin_pcie->sysctrl);
> > -
> > -	return 0;
> > +	return PTR_ERR_OR_ZERO(kirin_pcie->sysctrl);
> >  }
> >
> >  static int kirin_pcie_phy_init(struct kirin_pcie *kirin_pcie)