* [PATCH v2 2/3] fpga: socfpga-a10: Convert to devm_platform_ioremap_resource()
2023-07-10 13:38 [PATCH v2 1/3] fpga: fpga-mgr: altera-pr-ip: Convert to devm_platform_ioremap_resource() Yangtao Li
@ 2023-07-10 13:38 ` Yangtao Li
2023-07-15 14:51 ` Xu Yilun
2023-07-10 13:38 ` [PATCH v2 3/3] fpga: socfpga-a10: Fix incorrect return value of devm_regmap_init_mmio Yangtao Li
2023-07-15 14:50 ` [PATCH v2 1/3] fpga: fpga-mgr: altera-pr-ip: Convert to devm_platform_ioremap_resource() Xu Yilun
2 siblings, 1 reply; 7+ messages in thread
From: Yangtao Li @ 2023-07-10 13:38 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 | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/fpga/socfpga-a10.c b/drivers/fpga/socfpga-a10.c
index ac8e89b8a5cc..cc4861e345c9 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);
--
2.39.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/3] fpga: socfpga-a10: Convert to devm_platform_ioremap_resource()
2023-07-10 13:38 ` [PATCH v2 2/3] fpga: socfpga-a10: " Yangtao Li
@ 2023-07-15 14:51 ` Xu Yilun
0 siblings, 0 replies; 7+ messages in thread
From: Xu Yilun @ 2023-07-15 14:51 UTC (permalink / raw)
To: Yangtao Li; +Cc: Moritz Fischer, Wu Hao, Tom Rix, linux-fpga, linux-kernel
On 2023-07-10 at 21:38:29 +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-a10.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/fpga/socfpga-a10.c b/drivers/fpga/socfpga-a10.c
> index ac8e89b8a5cc..cc4861e345c9 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);
>
> --
> 2.39.0
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 3/3] fpga: socfpga-a10: Fix incorrect return value of devm_regmap_init_mmio
2023-07-10 13:38 [PATCH v2 1/3] fpga: fpga-mgr: altera-pr-ip: Convert to devm_platform_ioremap_resource() Yangtao Li
2023-07-10 13:38 ` [PATCH v2 2/3] fpga: socfpga-a10: " Yangtao Li
@ 2023-07-10 13:38 ` Yangtao Li
2023-07-10 14:11 ` Greg Kroah-Hartman
2023-07-15 14:50 ` [PATCH v2 1/3] fpga: fpga-mgr: altera-pr-ip: Convert to devm_platform_ioremap_resource() Xu Yilun
2 siblings, 1 reply; 7+ messages in thread
From: Yangtao Li @ 2023-07-10 13:38 UTC (permalink / raw)
To: Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix, Alan Tull,
Greg Kroah-Hartman
Cc: Yangtao Li, Moritz Fischer, linux-fpga, linux-kernel
When devm_regmap_init_mmio fails, we should return PTR_ERR(priv->regmap)
instead of -ENODEV.
Fixes: acbb910ae04b ("fpga-manager: Add Socfpga Arria10 support")
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
drivers/fpga/socfpga-a10.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/fpga/socfpga-a10.c b/drivers/fpga/socfpga-a10.c
index cc4861e345c9..b7b6e0bdb3d9 100644
--- a/drivers/fpga/socfpga-a10.c
+++ b/drivers/fpga/socfpga-a10.c
@@ -491,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] 7+ messages in thread* Re: [PATCH v2 3/3] fpga: socfpga-a10: Fix incorrect return value of devm_regmap_init_mmio
2023-07-10 13:38 ` [PATCH v2 3/3] fpga: socfpga-a10: Fix incorrect return value of devm_regmap_init_mmio Yangtao Li
@ 2023-07-10 14:11 ` Greg Kroah-Hartman
2023-07-12 1:42 ` Xu Yilun
0 siblings, 1 reply; 7+ messages in thread
From: Greg Kroah-Hartman @ 2023-07-10 14:11 UTC (permalink / raw)
To: Yangtao Li
Cc: Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix, Alan Tull,
Moritz Fischer, linux-fpga, linux-kernel
On Mon, Jul 10, 2023 at 09:38:30PM +0800, Yangtao Li wrote:
> When devm_regmap_init_mmio fails, we should return PTR_ERR(priv->regmap)
> instead of -ENODEV.
>
> Fixes: acbb910ae04b ("fpga-manager: Add Socfpga Arria10 support")
Why are you not also including a cc: stable@ tag here?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v2 3/3] fpga: socfpga-a10: Fix incorrect return value of devm_regmap_init_mmio
2023-07-10 14:11 ` Greg Kroah-Hartman
@ 2023-07-12 1:42 ` Xu Yilun
0 siblings, 0 replies; 7+ messages in thread
From: Xu Yilun @ 2023-07-12 1:42 UTC (permalink / raw)
To: Greg Kroah-Hartman, frank.li
Cc: Yangtao Li, Moritz Fischer, Wu Hao, Tom Rix, Alan Tull,
Moritz Fischer, linux-fpga, linux-kernel
On 2023-07-10 at 16:11:35 +0200, Greg Kroah-Hartman wrote:
> On Mon, Jul 10, 2023 at 09:38:30PM +0800, Yangtao Li wrote:
> > When devm_regmap_init_mmio fails, we should return PTR_ERR(priv->regmap)
> > instead of -ENODEV.
> >
> > Fixes: acbb910ae04b ("fpga-manager: Add Socfpga Arria10 support")
>
> Why are you not also including a cc: stable@ tag here?
The change is to propagate the error number produced by regmap, instead
of using a fixed error number.
I think this is more of an improvement, not a bug fix. So no need to
merge to stable? And the changelog should be improved to avoid
confusing.
Thanks,
Yilun
>
> thanks,
>
> greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/3] fpga: fpga-mgr: altera-pr-ip: Convert to devm_platform_ioremap_resource()
2023-07-10 13:38 [PATCH v2 1/3] fpga: fpga-mgr: altera-pr-ip: Convert to devm_platform_ioremap_resource() Yangtao Li
2023-07-10 13:38 ` [PATCH v2 2/3] fpga: socfpga-a10: " Yangtao Li
2023-07-10 13:38 ` [PATCH v2 3/3] fpga: socfpga-a10: Fix incorrect return value of devm_regmap_init_mmio Yangtao Li
@ 2023-07-15 14:50 ` Xu Yilun
2 siblings, 0 replies; 7+ messages in thread
From: Xu Yilun @ 2023-07-15 14:50 UTC (permalink / raw)
To: Yangtao Li; +Cc: Moritz Fischer, Wu Hao, Tom Rix, linux-fpga, linux-kernel
On 2023-07-10 at 21:38:28 +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.
> ---
> v2:
> -keep comment
> drivers/fpga/altera-pr-ip-core-plat.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/fpga/altera-pr-ip-core-plat.c b/drivers/fpga/altera-pr-ip-core-plat.c
> index b008a6b8d2d3..06c6a4721205 100644
> --- a/drivers/fpga/altera-pr-ip-core-plat.c
> +++ b/drivers/fpga/altera-pr-ip-core-plat.c
> @@ -15,13 +15,9 @@ 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 [flat|nested] 7+ messages in thread