PCI: dwc: Use PTR_ERR_OR_ZERO() in five functions
Subsystems (8)
PATCH 1/1 PCI: dwc: Use PTR_ERR_OR_ZERO() in five functions
From: Markus Elfring <[email protected]>
Date: Fri, 6 Sep 2019 20:40:06 +0200
Simplify these function implementations by using a known function.
Generated by: scripts/coccinelle/api/ptr_ret.cocci
--- drivers/pci/controller/dwc/pci-exynos.c | 5 +---- drivers/pci/controller/dwc/pci-meson.c | 10 ++-------- drivers/pci/controller/dwc/pcie-kirin.c | 10 ++-------- 3 files changed, 5 insertions(+), 20 deletions(-)
drivers/pci/controller/dwc/pci-exynos.c +1 -4
@@ -92,10 +92,7 @@ static int exynos5440_pcie_get_mem_resources(struct platform_device *pdev, res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); ep->mem_res->elbi_base =devm_ioremap_resource (dev, res); -if (IS_ERR (ep->mem_res->elbi_base)) -return PTR_ERR (ep->mem_res->elbi_base); - -return 0 ; +return PTR_ERR_OR_ZERO (ep->mem_res->elbi_base); }static int exynos5440_pcie_get_clk_resources (struct exynos_pcie *ep)
drivers/pci/controller/dwc/pci-meson.c +2 -8
@@ -182,10 +182,7 @@ static int meson_pcie_get_mems(struct platform_device *pdev,/* Meson SoC has two PCI controllers use same phy register*/ mp->mem_res.phy_base =meson_pcie_get_mem_shared (pdev, mp,"phy" ); -if (IS_ERR (mp->mem_res.phy_base)) -return PTR_ERR (mp->mem_res.phy_base); - -return 0 ; +return PTR_ERR_OR_ZERO (mp->mem_res.phy_base); }static void meson_pcie_power_on (struct meson_pcie *mp)
@@ -259,10 +256,7 @@ static int meson_pcie_probe_clocks(struct meson_pcie *mp)return PTR_ERR (res->general_clk); res->clk =meson_pcie_probe_clock (dev,"pcie" ,0 ); -if (IS_ERR (res->clk)) -return PTR_ERR (res->clk); - -return 0 ; +return PTR_ERR_OR_ZERO (res->clk); }static inline void meson_elb_writel (struct meson_pcie *mp,u32 val,u32 reg)
drivers/pci/controller/dwc/pcie-kirin.c +2 -8
@@ -138,10 +138,7 @@ static long kirin_pcie_get_clk(struct kirin_pcie *kirin_pcie,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(struct kirin_pcie *kirin_pcie, 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)
--
2.23.0
Quoted 8 lines · Markus Elfring
From: Markus Elfring <[email protected]>
Date: Fri, 6 Sep 2019 20:40:06 +0200Simplify these function implementations by using a known function.
Generated by:
scripts/coccinelle/api/ptr_ret.cocciSigned-off-by Markus Elfring <[email protected]>
Thanks for this, looks good to me:
Quoted 85 lines
--- drivers/pci/controller/dwc/pci-exynos.c | 5 +---- drivers/pci/controller/dwc/pci-meson.c | 10 ++-------- drivers/pci/controller/dwc/pcie-kirin.c | 10 ++-------- 3 files changed, 5 insertions(+), 20 deletions(-)drivers/pci/controller/dwc/pci-exynos.c +1
-4@@ -92,10 +92,7 @@ static int exynos5440_pcie_get_mem_resources(struct platform_device *pdev, res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); ep->mem_res->elbi_base =devm_ioremap_resource (dev, res); -if (IS_ERR (ep->mem_res->elbi_base)) -return PTR_ERR (ep->mem_res->elbi_base); - -return 0 ; +return PTR_ERR_OR_ZERO (ep->mem_res->elbi_base); }static int exynos5440_pcie_get_clk_resources (struct exynos_pcie *ep)drivers/pci/controller/dwc/pci-meson.c +2
-8@@ -182,10 +182,7 @@ static int meson_pcie_get_mems(struct platform_device *pdev,/* Meson SoC has two PCI controllers use same phy register*/ mp->mem_res.phy_base =meson_pcie_get_mem_shared (pdev, mp,"phy" ); -if (IS_ERR (mp->mem_res.phy_base)) -return PTR_ERR (mp->mem_res.phy_base); - -return 0 ; +return PTR_ERR_OR_ZERO (mp->mem_res.phy_base); }static void meson_pcie_power_on (struct meson_pcie *mp)@@ -259,10 +256,7 @@ static int meson_pcie_probe_clocks(struct meson_pcie *mp)return PTR_ERR (res->general_clk); res->clk =meson_pcie_probe_clock (dev,"pcie" ,0 ); -if (IS_ERR (res->clk)) -return PTR_ERR (res->clk); - -return 0 ; +return PTR_ERR_OR_ZERO (res->clk); }static inline void meson_elb_writel (struct meson_pcie *mp,u32 val,u32 reg)drivers/pci/controller/dwc/pcie-kirin.c +2
-9@@ -138,10 +138,7 @@ static long kirin_pcie_get_clk(struct kirin_pcie *kirin_pcie,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(struct kirin_pcie *kirin_pcie, 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) --2.23.0
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 5 lines · Markus Elfring
From: Markus Elfring <[email protected]>
Date: Fri, 6 Sep 2019 20:40:06 +0200Simplify these function implementations by using a known function.
Quoted 8 lines
Generated by:
scripts/coccinelle/api/ptr_ret.cocciSigned-off-by Markus Elfring <[email protected]>--- drivers/pci/controller/dwc/pci-exynos.c | 5 +---- drivers/pci/controller/dwc/pci-meson.c | 10 ++-------- drivers/pci/controller/dwc/pcie-kirin.c | 10 ++-------- 3 files changed, 5 insertions(+), 20 deletions(-)
https://lore.kernel.org/linux-pci/20190527140952.GB7202@ulmo/
Dropped, sorry.
Lorenzo
Quoted 74 lines
drivers/pci/controller/dwc/pci-exynos.c +1
-4@@ -92,10 +92,7 @@ static int exynos5440_pcie_get_mem_resources(struct platform_device *pdev, res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); ep->mem_res->elbi_base =devm_ioremap_resource (dev, res); -if (IS_ERR (ep->mem_res->elbi_base)) -return PTR_ERR (ep->mem_res->elbi_base); - -return 0 ; +return PTR_ERR_OR_ZERO (ep->mem_res->elbi_base); }static int exynos5440_pcie_get_clk_resources (struct exynos_pcie *ep)drivers/pci/controller/dwc/pci-meson.c +2
-8@@ -182,10 +182,7 @@ static int meson_pcie_get_mems(struct platform_device *pdev,/* Meson SoC has two PCI controllers use same phy register*/ mp->mem_res.phy_base =meson_pcie_get_mem_shared (pdev, mp,"phy" ); -if (IS_ERR (mp->mem_res.phy_base)) -return PTR_ERR (mp->mem_res.phy_base); - -return 0 ; +return PTR_ERR_OR_ZERO (mp->mem_res.phy_base); }static void meson_pcie_power_on (struct meson_pcie *mp)@@ -259,10 +256,7 @@ static int meson_pcie_probe_clocks(struct meson_pcie *mp)return PTR_ERR (res->general_clk); res->clk =meson_pcie_probe_clock (dev,"pcie" ,0 ); -if (IS_ERR (res->clk)) -return PTR_ERR (res->clk); - -return 0 ; +return PTR_ERR_OR_ZERO (res->clk); }static inline void meson_elb_writel (struct meson_pcie *mp,u32 val,u32 reg)drivers/pci/controller/dwc/pcie-kirin.c +2
-9@@ -138,10 +138,7 @@ static long kirin_pcie_get_clk(struct kirin_pcie *kirin_pcie,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(struct kirin_pcie *kirin_pcie, 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) --2.23.0