All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yangtao Li <frank.li@vivo.com>
To: Moritz Fischer <mdf@kernel.org>, Wu Hao <hao.wu@intel.com>,
	Xu Yilun <yilun.xu@intel.com>, Tom Rix <trix@redhat.com>
Cc: Yangtao Li <frank.li@vivo.com>,
	linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/8] fpga: socfpga-a10: Convert to devm_platform_ioremap_resource()
Date: Wed,  5 Jul 2023 17:46:51 +0800	[thread overview]
Message-ID: <20230705094655.44753-4-frank.li@vivo.com> (raw)
In-Reply-To: <20230705094655.44753-1-frank.li@vivo.com>

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


  parent reply	other threads:[~2023-07-05  9:47 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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-10  8:30   ` Xu Yilun
2023-07-05  9:46 ` [PATCH 3/8] fpga: dfl-fme-mgr: " Yangtao Li
2023-07-10  8:39   ` Xu Yilun
2023-07-05  9:46 ` Yangtao Li [this message]
2023-07-10  8:36   ` [PATCH 4/8] fpga: socfpga-a10: " Xu Yilun
2023-07-05  9:46 ` [PATCH 5/8] fpga: xilinx-pr-decoupler: " Yangtao Li
2023-07-05  9:46   ` Yangtao Li
2023-07-07  4:55   ` Michal Simek
2023-07-07  4:55     ` Michal Simek
2023-07-10  8:42     ` Xu Yilun
2023-07-10  8:42       ` Xu Yilun
2023-07-05  9:46 ` [PATCH 6/8] fpga: fpga-mgr: socfpga: " Yangtao Li
2023-07-10  8:47   ` Xu Yilun
2023-07-05  9:46 ` [PATCH 7/8] fpga: fpga-mgr: ts73xx: " Yangtao Li
2023-07-10  8:52   ` Xu Yilun
2023-07-05  9:46 ` [PATCH 8/8] fpga: zynq-fpga: " Yangtao Li
2023-07-05  9:46   ` Yangtao Li
2023-07-07  4:55   ` Michal Simek
2023-07-07  4:55     ` Michal Simek
2023-07-10  8:54     ` Xu Yilun
2023-07-10  8:54       ` Xu Yilun
2023-07-10  8:38 ` [PATCH 1/8] fpga: bridge: " Xu Yilun

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230705094655.44753-4-frank.li@vivo.com \
    --to=frank.li@vivo.com \
    --cc=hao.wu@intel.com \
    --cc=linux-fpga@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mdf@kernel.org \
    --cc=trix@redhat.com \
    --cc=yilun.xu@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.