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

Lorenzo Pieralisi lorenzo.pieralisi at arm.com
Tue Sep 18 07:35:54 PDT 2018


On Tue, Aug 14, 2018 at 07:45:18PM +0800, kbuild test robot wrote:
> From: kbuild test robot <fengguang.wu at intel.com>
> 
> drivers/pci/controller/dwc/pci-meson.c:121: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: b43bb00f7533 ("PCI: meson: add the Amlogic Meson PCIe controller driver")
> CC: Yue Wang <yue.wang at amlogic.com>
> Signed-off-by: kbuild test robot <fengguang.wu at intel.com>
> ---
> 
>  pci-meson.c |    5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)

I have dropped this patch from the PCI patch queue since it was
taken into account in updated patches versions, thanks for sending
it.

Thanks,
Lorenzo

> --- a/drivers/pci/controller/dwc/pci-meson.c
> +++ b/drivers/pci/controller/dwc/pci-meson.c
> @@ -118,10 +118,7 @@ static int meson_pcie_get_mem(struct pla
>  		return -ENODEV;
>  
>  	mp->mem_res.cfg_base = devm_ioremap_resource(dev, res);
> -	if (IS_ERR(mp->mem_res.cfg_base))
> -		return PTR_ERR(mp->mem_res.cfg_base);
> -
> -	return 0;
> +	return PTR_ERR_OR_ZERO(mp->mem_res.cfg_base);
>  }
>  
>  static int meson_pcie_init_clk(struct meson_pcie *mp)



More information about the linux-amlogic mailing list