* [PATCH 2/8] fpga: fpga-mgr: altera-pr-ip: Convert to devm_platform_ioremap_resource()
2023-07-05 9:46 [PATCH 1/8] fpga: bridge: Convert to devm_platform_ioremap_resource() Yangtao Li
@ 2023-07-05 9:46 ` Yangtao Li
2023-07-10 8:30 ` Xu Yilun
2023-07-05 9:46 ` [PATCH 3/8] fpga: dfl-fme-mgr: " Yangtao Li
` (6 subsequent siblings)
7 siblings, 1 reply; 18+ messages in thread
From: Yangtao Li @ 2023-07-05 9:46 UTC (permalink / raw)
To: Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix
Cc: Yangtao Li, linux-fpga, linux-kernel
Use devm_platform_ioremap_resource() to simplify code.
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
drivers/fpga/altera-pr-ip-core-plat.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/fpga/altera-pr-ip-core-plat.c b/drivers/fpga/altera-pr-ip-core-plat.c
index b008a6b8d2d3..fbeae6e68f60 100644
--- a/drivers/fpga/altera-pr-ip-core-plat.c
+++ b/drivers/fpga/altera-pr-ip-core-plat.c
@@ -15,13 +15,8 @@ static int alt_pr_platform_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
void __iomem *reg_base;
- struct resource *res;
-
- /* 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);
--
2.39.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 2/8] fpga: fpga-mgr: altera-pr-ip: Convert to devm_platform_ioremap_resource()
2023-07-05 9:46 ` [PATCH 2/8] fpga: fpga-mgr: altera-pr-ip: " Yangtao Li
@ 2023-07-10 8:30 ` Xu Yilun
0 siblings, 0 replies; 18+ messages in thread
From: Xu Yilun @ 2023-07-10 8:30 UTC (permalink / raw)
To: Yangtao Li; +Cc: Moritz Fischer, Wu Hao, Tom Rix, linux-fpga, linux-kernel
On 2023-07-05 at 17:46:49 +0800, Yangtao Li wrote:
> Use devm_platform_ioremap_resource() to simplify code.
>
> Signed-off-by: Yangtao Li <frank.li@vivo.com>
> ---
> drivers/fpga/altera-pr-ip-core-plat.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/fpga/altera-pr-ip-core-plat.c b/drivers/fpga/altera-pr-ip-core-plat.c
> index b008a6b8d2d3..fbeae6e68f60 100644
> --- a/drivers/fpga/altera-pr-ip-core-plat.c
> +++ b/drivers/fpga/altera-pr-ip-core-plat.c
> @@ -15,13 +15,8 @@ static int alt_pr_platform_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> void __iomem *reg_base;
> - struct resource *res;
> -
> - /* First mmio base is for register access */
Please don't drop the comments.
> - 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);
>
> --
> 2.39.0
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 3/8] fpga: dfl-fme-mgr: Convert to devm_platform_ioremap_resource()
2023-07-05 9:46 [PATCH 1/8] fpga: bridge: Convert to devm_platform_ioremap_resource() Yangtao Li
2023-07-05 9:46 ` [PATCH 2/8] fpga: fpga-mgr: altera-pr-ip: " Yangtao Li
@ 2023-07-05 9:46 ` Yangtao Li
2023-07-10 8:39 ` Xu Yilun
2023-07-05 9:46 ` [PATCH 4/8] fpga: socfpga-a10: " Yangtao Li
` (5 subsequent siblings)
7 siblings, 1 reply; 18+ messages in thread
From: Yangtao Li @ 2023-07-05 9:46 UTC (permalink / raw)
To: Wu Hao, Tom Rix, Moritz Fischer, Xu Yilun
Cc: Yangtao Li, linux-fpga, linux-kernel
Use devm_platform_ioremap_resource() to simplify code.
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
drivers/fpga/dfl-fme-mgr.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/fpga/dfl-fme-mgr.c b/drivers/fpga/dfl-fme-mgr.c
index af0785783b52..ab228d8837a0 100644
--- a/drivers/fpga/dfl-fme-mgr.c
+++ b/drivers/fpga/dfl-fme-mgr.c
@@ -280,7 +280,6 @@ static int fme_mgr_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct fme_mgr_priv *priv;
struct fpga_manager *mgr;
- struct resource *res;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
@@ -290,8 +289,7 @@ static int fme_mgr_probe(struct platform_device *pdev)
priv->ioaddr = pdata->ioaddr;
if (!priv->ioaddr) {
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- priv->ioaddr = devm_ioremap_resource(dev, res);
+ priv->ioaddr = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(priv->ioaddr))
return PTR_ERR(priv->ioaddr);
}
--
2.39.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 3/8] fpga: dfl-fme-mgr: Convert to devm_platform_ioremap_resource()
2023-07-05 9:46 ` [PATCH 3/8] fpga: dfl-fme-mgr: " Yangtao Li
@ 2023-07-10 8:39 ` Xu Yilun
0 siblings, 0 replies; 18+ messages in thread
From: Xu Yilun @ 2023-07-10 8:39 UTC (permalink / raw)
To: Yangtao Li; +Cc: Wu Hao, Tom Rix, Moritz Fischer, linux-fpga, linux-kernel
On 2023-07-05 at 17:46:50 +0800, Yangtao Li wrote:
> Use devm_platform_ioremap_resource() to simplify code.
>
> Signed-off-by: Yangtao Li <frank.li@vivo.com>
Acked-by: Xu Yilun <yilun.xu@intel.com>
Applied.
> ---
> drivers/fpga/dfl-fme-mgr.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/fpga/dfl-fme-mgr.c b/drivers/fpga/dfl-fme-mgr.c
> index af0785783b52..ab228d8837a0 100644
> --- a/drivers/fpga/dfl-fme-mgr.c
> +++ b/drivers/fpga/dfl-fme-mgr.c
> @@ -280,7 +280,6 @@ static int fme_mgr_probe(struct platform_device *pdev)
> struct device *dev = &pdev->dev;
> struct fme_mgr_priv *priv;
> struct fpga_manager *mgr;
> - struct resource *res;
>
> priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
> if (!priv)
> @@ -290,8 +289,7 @@ static int fme_mgr_probe(struct platform_device *pdev)
> priv->ioaddr = pdata->ioaddr;
>
> if (!priv->ioaddr) {
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - priv->ioaddr = devm_ioremap_resource(dev, res);
> + priv->ioaddr = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(priv->ioaddr))
> return PTR_ERR(priv->ioaddr);
> }
> --
> 2.39.0
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 4/8] fpga: socfpga-a10: Convert to devm_platform_ioremap_resource()
2023-07-05 9:46 [PATCH 1/8] fpga: bridge: Convert to devm_platform_ioremap_resource() Yangtao Li
2023-07-05 9:46 ` [PATCH 2/8] fpga: fpga-mgr: altera-pr-ip: " Yangtao Li
2023-07-05 9:46 ` [PATCH 3/8] fpga: dfl-fme-mgr: " Yangtao Li
@ 2023-07-05 9:46 ` Yangtao Li
2023-07-10 8:36 ` Xu Yilun
2023-07-05 9:46 ` [PATCH 5/8] fpga: xilinx-pr-decoupler: " Yangtao Li
` (4 subsequent siblings)
7 siblings, 1 reply; 18+ messages in thread
From: Yangtao Li @ 2023-07-05 9:46 UTC (permalink / raw)
To: Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix
Cc: Yangtao Li, linux-fpga, linux-kernel
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);
priv->clk = devm_clk_get(dev, NULL);
if (IS_ERR(priv->clk)) {
--
2.39.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 4/8] fpga: socfpga-a10: Convert to devm_platform_ioremap_resource()
2023-07-05 9:46 ` [PATCH 4/8] fpga: socfpga-a10: " Yangtao Li
@ 2023-07-10 8:36 ` Xu Yilun
0 siblings, 0 replies; 18+ messages in thread
From: Xu Yilun @ 2023-07-10 8:36 UTC (permalink / raw)
To: Yangtao Li; +Cc: Moritz Fischer, Wu Hao, Tom Rix, linux-fpga, linux-kernel
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
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 5/8] fpga: xilinx-pr-decoupler: Convert to devm_platform_ioremap_resource()
2023-07-05 9:46 [PATCH 1/8] fpga: bridge: Convert to devm_platform_ioremap_resource() Yangtao Li
` (2 preceding siblings ...)
2023-07-05 9:46 ` [PATCH 4/8] fpga: socfpga-a10: " Yangtao Li
@ 2023-07-05 9:46 ` Yangtao Li
2023-07-07 4:55 ` Michal Simek
2023-07-05 9:46 ` [PATCH 6/8] fpga: fpga-mgr: socfpga: " Yangtao Li
` (3 subsequent siblings)
7 siblings, 1 reply; 18+ messages in thread
From: Yangtao Li @ 2023-07-05 9:46 UTC (permalink / raw)
To: Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix, Michal Simek
Cc: Yangtao Li, linux-fpga, linux-arm-kernel, linux-kernel
Use devm_platform_ioremap_resource() to simplify code.
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
drivers/fpga/xilinx-pr-decoupler.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
index b76d85449b8f..208d9560f56d 100644
--- a/drivers/fpga/xilinx-pr-decoupler.c
+++ b/drivers/fpga/xilinx-pr-decoupler.c
@@ -108,7 +108,6 @@ static int xlnx_pr_decoupler_probe(struct platform_device *pdev)
struct xlnx_pr_decoupler_data *priv;
struct fpga_bridge *br;
int err;
- struct resource *res;
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
@@ -122,8 +121,7 @@ static int xlnx_pr_decoupler_probe(struct platform_device *pdev)
priv->ipconfig = match->data;
}
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- priv->io_base = devm_ioremap_resource(&pdev->dev, res);
+ priv->io_base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(priv->io_base))
return PTR_ERR(priv->io_base);
--
2.39.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 5/8] fpga: xilinx-pr-decoupler: Convert to devm_platform_ioremap_resource()
2023-07-05 9:46 ` [PATCH 5/8] fpga: xilinx-pr-decoupler: " Yangtao Li
@ 2023-07-07 4:55 ` Michal Simek
2023-07-10 8:42 ` Xu Yilun
0 siblings, 1 reply; 18+ messages in thread
From: Michal Simek @ 2023-07-07 4:55 UTC (permalink / raw)
To: Yangtao Li, Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix
Cc: linux-fpga, linux-arm-kernel, linux-kernel
On 7/5/23 11:46, Yangtao Li wrote:
> Use devm_platform_ioremap_resource() to simplify code.
>
> Signed-off-by: Yangtao Li <frank.li@vivo.com>
> ---
> drivers/fpga/xilinx-pr-decoupler.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
> index b76d85449b8f..208d9560f56d 100644
> --- a/drivers/fpga/xilinx-pr-decoupler.c
> +++ b/drivers/fpga/xilinx-pr-decoupler.c
> @@ -108,7 +108,6 @@ static int xlnx_pr_decoupler_probe(struct platform_device *pdev)
> struct xlnx_pr_decoupler_data *priv;
> struct fpga_bridge *br;
> int err;
> - struct resource *res;
>
> priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
> if (!priv)
> @@ -122,8 +121,7 @@ static int xlnx_pr_decoupler_probe(struct platform_device *pdev)
> priv->ipconfig = match->data;
> }
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - priv->io_base = devm_ioremap_resource(&pdev->dev, res);
> + priv->io_base = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(priv->io_base))
> return PTR_ERR(priv->io_base);
>
Acked-by: Michal Simek <michal.simek@amd.com>
M
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 5/8] fpga: xilinx-pr-decoupler: Convert to devm_platform_ioremap_resource()
2023-07-07 4:55 ` Michal Simek
@ 2023-07-10 8:42 ` Xu Yilun
0 siblings, 0 replies; 18+ messages in thread
From: Xu Yilun @ 2023-07-10 8:42 UTC (permalink / raw)
To: Michal Simek
Cc: Yangtao Li, Moritz Fischer, Wu Hao, Tom Rix, linux-fpga,
linux-arm-kernel, linux-kernel
On 2023-07-07 at 06:55:33 +0200, Michal Simek wrote:
>
>
> On 7/5/23 11:46, Yangtao Li wrote:
> > Use devm_platform_ioremap_resource() to simplify code.
> >
> > Signed-off-by: Yangtao Li <frank.li@vivo.com>
> > ---
> > drivers/fpga/xilinx-pr-decoupler.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
> > index b76d85449b8f..208d9560f56d 100644
> > --- a/drivers/fpga/xilinx-pr-decoupler.c
> > +++ b/drivers/fpga/xilinx-pr-decoupler.c
> > @@ -108,7 +108,6 @@ static int xlnx_pr_decoupler_probe(struct platform_device *pdev)
> > struct xlnx_pr_decoupler_data *priv;
> > struct fpga_bridge *br;
> > int err;
> > - struct resource *res;
> > priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
> > if (!priv)
> > @@ -122,8 +121,7 @@ static int xlnx_pr_decoupler_probe(struct platform_device *pdev)
> > priv->ipconfig = match->data;
> > }
> > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > - priv->io_base = devm_ioremap_resource(&pdev->dev, res);
> > + priv->io_base = devm_platform_ioremap_resource(pdev, 0);
> > if (IS_ERR(priv->io_base))
> > return PTR_ERR(priv->io_base);
>
> Acked-by: Michal Simek <michal.simek@amd.com>
Acked-by: Xu Yilun <yilun.xu@intel.com>
Applied.
>
> M
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 6/8] fpga: fpga-mgr: socfpga: Convert to devm_platform_ioremap_resource()
2023-07-05 9:46 [PATCH 1/8] fpga: bridge: Convert to devm_platform_ioremap_resource() Yangtao Li
` (3 preceding siblings ...)
2023-07-05 9:46 ` [PATCH 5/8] fpga: xilinx-pr-decoupler: " Yangtao Li
@ 2023-07-05 9:46 ` Yangtao Li
2023-07-10 8:47 ` Xu Yilun
2023-07-05 9:46 ` [PATCH 7/8] fpga: fpga-mgr: ts73xx: " Yangtao Li
` (2 subsequent siblings)
7 siblings, 1 reply; 18+ messages in thread
From: Yangtao Li @ 2023-07-05 9:46 UTC (permalink / raw)
To: Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix
Cc: Yangtao Li, linux-fpga, linux-kernel
Use devm_platform_ioremap_resource() to simplify code.
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
drivers/fpga/socfpga.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c
index 7e0741f99696..723ea0ad3f09 100644
--- a/drivers/fpga/socfpga.c
+++ b/drivers/fpga/socfpga.c
@@ -545,20 +545,17 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct socfpga_fpga_priv *priv;
struct fpga_manager *mgr;
- struct resource *res;
int ret;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- priv->fpga_base_addr = devm_ioremap_resource(dev, res);
+ priv->fpga_base_addr = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(priv->fpga_base_addr))
return PTR_ERR(priv->fpga_base_addr);
- 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);
--
2.39.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 6/8] fpga: fpga-mgr: socfpga: Convert to devm_platform_ioremap_resource()
2023-07-05 9:46 ` [PATCH 6/8] fpga: fpga-mgr: socfpga: " Yangtao Li
@ 2023-07-10 8:47 ` Xu Yilun
0 siblings, 0 replies; 18+ messages in thread
From: Xu Yilun @ 2023-07-10 8:47 UTC (permalink / raw)
To: Yangtao Li; +Cc: Moritz Fischer, Wu Hao, Tom Rix, linux-fpga, linux-kernel
On 2023-07-05 at 17:46:53 +0800, Yangtao Li wrote:
> Use devm_platform_ioremap_resource() to simplify code.
>
> Signed-off-by: Yangtao Li <frank.li@vivo.com>
Acked-by: Xu Yilun <yilun.xu@intel.com>
Applied.
> ---
> drivers/fpga/socfpga.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c
> index 7e0741f99696..723ea0ad3f09 100644
> --- a/drivers/fpga/socfpga.c
> +++ b/drivers/fpga/socfpga.c
> @@ -545,20 +545,17 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
> struct device *dev = &pdev->dev;
> struct socfpga_fpga_priv *priv;
> struct fpga_manager *mgr;
> - struct resource *res;
> int ret;
>
> priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
> if (!priv)
> return -ENOMEM;
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - priv->fpga_base_addr = devm_ioremap_resource(dev, res);
> + priv->fpga_base_addr = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(priv->fpga_base_addr))
> return PTR_ERR(priv->fpga_base_addr);
>
> - 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);
>
> --
> 2.39.0
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 7/8] fpga: fpga-mgr: ts73xx: Convert to devm_platform_ioremap_resource()
2023-07-05 9:46 [PATCH 1/8] fpga: bridge: Convert to devm_platform_ioremap_resource() Yangtao Li
` (4 preceding siblings ...)
2023-07-05 9:46 ` [PATCH 6/8] fpga: fpga-mgr: socfpga: " Yangtao Li
@ 2023-07-05 9:46 ` Yangtao Li
2023-07-10 8:52 ` Xu Yilun
2023-07-05 9:46 ` [PATCH 8/8] fpga: zynq-fpga: " Yangtao Li
2023-07-10 8:38 ` [PATCH 1/8] fpga: bridge: " Xu Yilun
7 siblings, 1 reply; 18+ messages in thread
From: Yangtao Li @ 2023-07-05 9:46 UTC (permalink / raw)
To: Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix
Cc: Yangtao Li, linux-fpga, linux-kernel
Use devm_platform_ioremap_resource() to simplify code.
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
drivers/fpga/ts73xx-fpga.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/fpga/ts73xx-fpga.c b/drivers/fpga/ts73xx-fpga.c
index 8e6e9c840d9d..4e1d2a4d3df4 100644
--- a/drivers/fpga/ts73xx-fpga.c
+++ b/drivers/fpga/ts73xx-fpga.c
@@ -103,7 +103,6 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
struct device *kdev = &pdev->dev;
struct ts73xx_fpga_priv *priv;
struct fpga_manager *mgr;
- struct resource *res;
priv = devm_kzalloc(kdev, sizeof(*priv), GFP_KERNEL);
if (!priv)
@@ -111,8 +110,7 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
priv->dev = kdev;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- priv->io_base = devm_ioremap_resource(kdev, res);
+ priv->io_base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(priv->io_base))
return PTR_ERR(priv->io_base);
--
2.39.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 7/8] fpga: fpga-mgr: ts73xx: Convert to devm_platform_ioremap_resource()
2023-07-05 9:46 ` [PATCH 7/8] fpga: fpga-mgr: ts73xx: " Yangtao Li
@ 2023-07-10 8:52 ` Xu Yilun
0 siblings, 0 replies; 18+ messages in thread
From: Xu Yilun @ 2023-07-10 8:52 UTC (permalink / raw)
To: Yangtao Li; +Cc: Moritz Fischer, Wu Hao, Tom Rix, linux-fpga, linux-kernel
On 2023-07-05 at 17:46:54 +0800, Yangtao Li wrote:
> Use devm_platform_ioremap_resource() to simplify code.
>
> Signed-off-by: Yangtao Li <frank.li@vivo.com>
Acked-by: Xu Yilun <yilun.xu@intel.com>
Applied.
> ---
> drivers/fpga/ts73xx-fpga.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/fpga/ts73xx-fpga.c b/drivers/fpga/ts73xx-fpga.c
> index 8e6e9c840d9d..4e1d2a4d3df4 100644
> --- a/drivers/fpga/ts73xx-fpga.c
> +++ b/drivers/fpga/ts73xx-fpga.c
> @@ -103,7 +103,6 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
> struct device *kdev = &pdev->dev;
> struct ts73xx_fpga_priv *priv;
> struct fpga_manager *mgr;
> - struct resource *res;
>
> priv = devm_kzalloc(kdev, sizeof(*priv), GFP_KERNEL);
> if (!priv)
> @@ -111,8 +110,7 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
>
> priv->dev = kdev;
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - priv->io_base = devm_ioremap_resource(kdev, res);
> + priv->io_base = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(priv->io_base))
> return PTR_ERR(priv->io_base);
>
> --
> 2.39.0
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 8/8] fpga: zynq-fpga: Convert to devm_platform_ioremap_resource()
2023-07-05 9:46 [PATCH 1/8] fpga: bridge: Convert to devm_platform_ioremap_resource() Yangtao Li
` (5 preceding siblings ...)
2023-07-05 9:46 ` [PATCH 7/8] fpga: fpga-mgr: ts73xx: " Yangtao Li
@ 2023-07-05 9:46 ` Yangtao Li
2023-07-07 4:55 ` Michal Simek
2023-07-10 8:38 ` [PATCH 1/8] fpga: bridge: " Xu Yilun
7 siblings, 1 reply; 18+ messages in thread
From: Yangtao Li @ 2023-07-05 9:46 UTC (permalink / raw)
To: Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix, Michal Simek
Cc: Yangtao Li, linux-fpga, linux-arm-kernel, linux-kernel
Use devm_platform_ioremap_resource() to simplify code.
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
drivers/fpga/zynq-fpga.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
index f8214cae9b6e..96611d424a10 100644
--- a/drivers/fpga/zynq-fpga.c
+++ b/drivers/fpga/zynq-fpga.c
@@ -555,7 +555,6 @@ static int zynq_fpga_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct zynq_fpga_priv *priv;
struct fpga_manager *mgr;
- struct resource *res;
int err;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -563,8 +562,7 @@ static int zynq_fpga_probe(struct platform_device *pdev)
return -ENOMEM;
spin_lock_init(&priv->dma_lock);
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- priv->io_base = devm_ioremap_resource(dev, res);
+ priv->io_base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(priv->io_base))
return PTR_ERR(priv->io_base);
--
2.39.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 8/8] fpga: zynq-fpga: Convert to devm_platform_ioremap_resource()
2023-07-05 9:46 ` [PATCH 8/8] fpga: zynq-fpga: " Yangtao Li
@ 2023-07-07 4:55 ` Michal Simek
2023-07-10 8:54 ` Xu Yilun
0 siblings, 1 reply; 18+ messages in thread
From: Michal Simek @ 2023-07-07 4:55 UTC (permalink / raw)
To: Yangtao Li, Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix
Cc: linux-fpga, linux-arm-kernel, linux-kernel
On 7/5/23 11:46, Yangtao Li wrote:
> Use devm_platform_ioremap_resource() to simplify code.
>
> Signed-off-by: Yangtao Li <frank.li@vivo.com>
> ---
> drivers/fpga/zynq-fpga.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
> index f8214cae9b6e..96611d424a10 100644
> --- a/drivers/fpga/zynq-fpga.c
> +++ b/drivers/fpga/zynq-fpga.c
> @@ -555,7 +555,6 @@ static int zynq_fpga_probe(struct platform_device *pdev)
> struct device *dev = &pdev->dev;
> struct zynq_fpga_priv *priv;
> struct fpga_manager *mgr;
> - struct resource *res;
> int err;
>
> priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
> @@ -563,8 +562,7 @@ static int zynq_fpga_probe(struct platform_device *pdev)
> return -ENOMEM;
> spin_lock_init(&priv->dma_lock);
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - priv->io_base = devm_ioremap_resource(dev, res);
> + priv->io_base = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(priv->io_base))
> return PTR_ERR(priv->io_base);
>
Acked-by: Michal Simek <michal.simek@amd.com>
M
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 8/8] fpga: zynq-fpga: Convert to devm_platform_ioremap_resource()
2023-07-07 4:55 ` Michal Simek
@ 2023-07-10 8:54 ` Xu Yilun
0 siblings, 0 replies; 18+ messages in thread
From: Xu Yilun @ 2023-07-10 8:54 UTC (permalink / raw)
To: Michal Simek
Cc: Yangtao Li, Moritz Fischer, Wu Hao, Tom Rix, linux-fpga,
linux-arm-kernel, linux-kernel
On 2023-07-07 at 06:55:49 +0200, Michal Simek wrote:
>
>
> On 7/5/23 11:46, Yangtao Li wrote:
> > Use devm_platform_ioremap_resource() to simplify code.
> >
> > Signed-off-by: Yangtao Li <frank.li@vivo.com>
> > ---
> > drivers/fpga/zynq-fpga.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
> > index f8214cae9b6e..96611d424a10 100644
> > --- a/drivers/fpga/zynq-fpga.c
> > +++ b/drivers/fpga/zynq-fpga.c
> > @@ -555,7 +555,6 @@ static int zynq_fpga_probe(struct platform_device *pdev)
> > struct device *dev = &pdev->dev;
> > struct zynq_fpga_priv *priv;
> > struct fpga_manager *mgr;
> > - struct resource *res;
> > int err;
> > priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
> > @@ -563,8 +562,7 @@ static int zynq_fpga_probe(struct platform_device *pdev)
> > return -ENOMEM;
> > spin_lock_init(&priv->dma_lock);
> > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > - priv->io_base = devm_ioremap_resource(dev, res);
> > + priv->io_base = devm_platform_ioremap_resource(pdev, 0);
> > if (IS_ERR(priv->io_base))
> > return PTR_ERR(priv->io_base);
>
> Acked-by: Michal Simek <michal.simek@amd.com>
Acked-by: Xu Yilun <yilun.xu@intel.com>
Applied.
>
> M
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/8] fpga: bridge: Convert to devm_platform_ioremap_resource()
2023-07-05 9:46 [PATCH 1/8] fpga: bridge: Convert to devm_platform_ioremap_resource() Yangtao Li
` (6 preceding siblings ...)
2023-07-05 9:46 ` [PATCH 8/8] fpga: zynq-fpga: " Yangtao Li
@ 2023-07-10 8:38 ` Xu Yilun
7 siblings, 0 replies; 18+ messages in thread
From: Xu Yilun @ 2023-07-10 8:38 UTC (permalink / raw)
To: Yangtao Li; +Cc: Moritz Fischer, Wu Hao, Tom Rix, linux-fpga, linux-kernel
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 <frank.li@vivo.com>
Acked-by: Xu Yilun <yilun.xu@intel.com>
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
>
^ permalink raw reply [flat|nested] 18+ messages in thread