2023-07-05 10:15:00

by 李扬韬

Subject: [PATCH 1/8] fpga: bridge: Convert to devm_platform_ioremap_resource()

Use devm_platform_ioremap_resource() to simplify code.

Signed-off-by: Yangtao Li <[email protected]>
---
drivers/fpga/altera-freeze-bridge.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/fpga/altera-freeze-bridge.c b/drivers/fpga/altera-freeze-bridge.c
index 445f4b011167..bb6b02ec2d21 100644
--- a/drivers/fpga/altera-freeze-bridge.c
+++ b/drivers/fpga/altera-freeze-bridge.c
@@ -213,14 +213,12 @@ static int altera_freeze_br_probe(struct platform_device *pdev)
void __iomem *base_addr;
struct altera_freeze_br_data *priv;
struct fpga_bridge *br;
- struct resource *res;
u32 status, revision;

if (!np)
return -ENODEV;

- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- base_addr = devm_ioremap_resource(dev, res);
+ base_addr = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(base_addr))
return PTR_ERR(base_addr);

--
2.39.0

2023-07-05 10:17:41

by 李扬韬

Subject: [PATCH 4/8] fpga: socfpga-a10: Convert to devm_platform_ioremap_resource()

Use devm_platform_ioremap_resource() to simplify code.

Signed-off-by: Yangtao Li <[email protected]>
---
drivers/fpga/socfpga-a10.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/fpga/socfpga-a10.c b/drivers/fpga/socfpga-a10.c
index ac8e89b8a5cc..b7b6e0bdb3d9 100644
--- a/drivers/fpga/socfpga-a10.c
+++ b/drivers/fpga/socfpga-a10.c
@@ -471,7 +471,6 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
struct a10_fpga_priv *priv;
void __iomem *reg_base;
struct fpga_manager *mgr;
- struct resource *res;
int ret;

priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -479,14 +478,12 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
return -ENOMEM;

/* First mmio base is for register access */
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- reg_base = devm_ioremap_resource(dev, res);
+ reg_base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(reg_base))
return PTR_ERR(reg_base);

/* Second mmio base is for writing FPGA image data */
- res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
- priv->fpga_data_addr = devm_ioremap_resource(dev, res);
+ priv->fpga_data_addr = devm_platform_ioremap_resource(pdev, 1);
if (IS_ERR(priv->fpga_data_addr))
return PTR_ERR(priv->fpga_data_addr);

@@ -494,7 +491,7 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
priv->regmap = devm_regmap_init_mmio(dev, reg_base,
&socfpga_a10_fpga_regmap_config);
if (IS_ERR(priv->regmap))
- return -ENODEV;
+ return PTR_ERR(priv->regmap);

priv->clk = devm_clk_get(dev, NULL);
if (IS_ERR(priv->clk)) {
--
2.39.0

2023-07-10 09:01:08

by Xu Yilun

Subject: Re: [PATCH 1/8] fpga: bridge: Convert to devm_platform_ioremap_resource()

On 2023-07-05 at 17:46:48 +0800, Yangtao Li wrote:
> Use devm_platform_ioremap_resource() to simplify code.
>
> Signed-off-by: Yangtao Li <[email protected]>

Acked-by: Xu Yilun <[email protected]>

Applied.

> ---
> drivers/fpga/altera-freeze-bridge.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/fpga/altera-freeze-bridge.c b/drivers/fpga/altera-freeze-bridge.c
> index 445f4b011167..bb6b02ec2d21 100644
> --- a/drivers/fpga/altera-freeze-bridge.c
> +++ b/drivers/fpga/altera-freeze-bridge.c
> @@ -213,14 +213,12 @@ static int altera_freeze_br_probe(struct platform_device *pdev)
> void __iomem *base_addr;
> struct altera_freeze_br_data *priv;
> struct fpga_bridge *br;
> - struct resource *res;
> u32 status, revision;
>
> if (!np)
> return -ENODEV;
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - base_addr = devm_ioremap_resource(dev, res);
> + base_addr = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(base_addr))
> return PTR_ERR(base_addr);
>
> --
> 2.39.0
>

2023-07-10 09:03:07

by Xu Yilun

Subject: Re: [PATCH 4/8] fpga: socfpga-a10: Convert to devm_platform_ioremap_resource()

On 2023-07-05 at 17:46:51 +0800, Yangtao Li wrote:
> Use devm_platform_ioremap_resource() to simplify code.
>
> Signed-off-by: Yangtao Li <[email protected]>
> ---
> drivers/fpga/socfpga-a10.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/fpga/socfpga-a10.c b/drivers/fpga/socfpga-a10.c
> index ac8e89b8a5cc..b7b6e0bdb3d9 100644
> --- a/drivers/fpga/socfpga-a10.c
> +++ b/drivers/fpga/socfpga-a10.c
> @@ -471,7 +471,6 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
> struct a10_fpga_priv *priv;
> void __iomem *reg_base;
> struct fpga_manager *mgr;
> - struct resource *res;
> int ret;
>
> priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
> @@ -479,14 +478,12 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
> return -ENOMEM;
>
> /* First mmio base is for register access */
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - reg_base = devm_ioremap_resource(dev, res);
> + reg_base = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(reg_base))
> return PTR_ERR(reg_base);
>
> /* Second mmio base is for writing FPGA image data */
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> - priv->fpga_data_addr = devm_ioremap_resource(dev, res);
> + priv->fpga_data_addr = devm_platform_ioremap_resource(pdev, 1);
> if (IS_ERR(priv->fpga_data_addr))
> return PTR_ERR(priv->fpga_data_addr);
>
> @@ -494,7 +491,7 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
> priv->regmap = devm_regmap_init_mmio(dev, reg_base,
> &socfpga_a10_fpga_regmap_config);
> if (IS_ERR(priv->regmap))
> - return -ENODEV;
> + return PTR_ERR(priv->regmap);

It's good. But please seperate the patch and specify in changelog.

>
> priv->clk = devm_clk_get(dev, NULL);
> if (IS_ERR(priv->clk)) {
> --
> 2.39.0
>