| Message ID | 20230705094655.44753-4-frank.li@vivo.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/8] fpga: bridge: Convert to devm_platform_ioremap_resource() | expand |
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 <frank.li@vivo.com> > --- > 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 >
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)) {
Use devm_platform_ioremap_resource() to simplify code. Signed-off-by: Yangtao Li <frank.li@vivo.com> --- drivers/fpga/socfpga-a10.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)