2020-11-17 01:55:46

by Sudip Mukherjee

Subject: [PATCH] PCI: dwc/meson: Use PTR_ERR_OR_ZERO

Coccinelle suggested using PTR_ERR_OR_ZERO() and looking at the code,
we can use PTR_ERR_OR_ZERO() instead of checking IS_ERR() and then
doing 'return 0'.

Signed-off-by: Sudip Mukherjee <[email protected]>
---
drivers/pci/controller/dwc/pci-meson.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc/pci-meson.c
index 1913dc2c8fa0..f4261f5aceb1 100644
--- a/drivers/pci/controller/dwc/pci-meson.c
+++ b/drivers/pci/controller/dwc/pci-meson.c
@@ -115,10 +115,8 @@ static int meson_pcie_get_mems(struct platform_device *pdev,
return PTR_ERR(pci->dbi_base);

mp->cfg_base = devm_platform_ioremap_resource_byname(pdev, "cfg");
- if (IS_ERR(mp->cfg_base))
- return PTR_ERR(mp->cfg_base);

- return 0;
+ return PTR_ERR_OR_ZERO(mp->cfg_base);
}

static int meson_pcie_power_on(struct meson_pcie *mp)
@@ -208,10 +206,8 @@ static int meson_pcie_probe_clocks(struct meson_pcie *mp)
return PTR_ERR(res->general_clk);

res->clk = meson_pcie_probe_clock(dev, "pclk", 0);
- if (IS_ERR(res->clk))
- return PTR_ERR(res->clk);

- return 0;
+ return PTR_ERR_OR_ZERO(res->clk);
}

static inline u32 meson_cfg_readl(struct meson_pcie *mp, u32 reg)
--
2.11.0

2020-11-17 08:38:44

by Neil Armstrong

Subject: Re: [PATCH] PCI: dwc/meson: Use PTR_ERR_OR_ZERO

On 16/11/2020 17:34, Sudip Mukherjee wrote:
> Coccinelle suggested using PTR_ERR_OR_ZERO() and looking at the code,
> we can use PTR_ERR_OR_ZERO() instead of checking IS_ERR() and then
> doing 'return 0'.
>
> Signed-off-by: Sudip Mukherjee <[email protected]>
> ---
> drivers/pci/controller/dwc/pci-meson.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc/pci-meson.c
> index 1913dc2c8fa0..f4261f5aceb1 100644
> --- a/drivers/pci/controller/dwc/pci-meson.c
> +++ b/drivers/pci/controller/dwc/pci-meson.c
> @@ -115,10 +115,8 @@ static int meson_pcie_get_mems(struct platform_device *pdev,
> return PTR_ERR(pci->dbi_base);
>
> mp->cfg_base = devm_platform_ioremap_resource_byname(pdev, "cfg");
> - if (IS_ERR(mp->cfg_base))
> - return PTR_ERR(mp->cfg_base);
>
> - return 0;
> + return PTR_ERR_OR_ZERO(mp->cfg_base);
> }
>
> static int meson_pcie_power_on(struct meson_pcie *mp)
> @@ -208,10 +206,8 @@ static int meson_pcie_probe_clocks(struct meson_pcie *mp)
> return PTR_ERR(res->general_clk);
>
> res->clk = meson_pcie_probe_clock(dev, "pclk", 0);
> - if (IS_ERR(res->clk))
> - return PTR_ERR(res->clk);
>
> - return 0;
> + return PTR_ERR_OR_ZERO(res->clk);
> }
>
> static inline u32 meson_cfg_readl(struct meson_pcie *mp, u32 reg)
>

Hi,

This has been nacked multiple times already:
https://lore.kernel.org/linux-pci/20190527140952.GB7202@ulmo/

Neil