Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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
Message-Id: <20230705094655.44753-4-frank.li@vivo.com>
In-Reply-To: <20230705094655.44753-1-frank.li@vivo.com>
References: <20230705094655.44753-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?d8b/iMZQe5Kbhp2Oh/6OwvRpXO0GLwzv4hWRJ2cY9BAlaF2+Qe4Is8Xzmqmp?=
 =?us-ascii?Q?TPsFJ0j/pHVWxrj104JJW1UrYDqiRLnV7dMUoe2I6XQuV4EJMdp95faGH/2s?=
 =?us-ascii?Q?7CKgbowN1QZxXrYEAbMraBqg95V8QZ2qZaqkROXUljCmtV8X99YwJBNfd0Xq?=
 =?us-ascii?Q?3tkmE8eqc6Dz9wgOdyrqFnif4wSEVH/NM7Q8GXTttWHaBNByyBStQeoQBCHD?=
 =?us-ascii?Q?XfLAQNI95FwALmOinVemfrhRb/saO0MoR1T2MChw4zhozYP0vNqmjCqyHy/i?=
 =?us-ascii?Q?xTzF/5Gde9Y5H4HEWpZG2T7ehMv3x62fstD0kZKY5kA/EX3DzTwDjsDk9vGY?=
 =?us-ascii?Q?PUyRfVMlzgYWRbDidd8KYgxn+7Z1+hnONtu1h4pXRAOVOn0AFj6KVPntGkJH?=
 =?us-ascii?Q?9W4kOC7ulBzm+lhpr+70nQ8Yvq7HdzF5jNtrkyU57wRhFGK87mfiWAwDjWEF?=
 =?us-ascii?Q?kZyLdpVFF1ThTTiN5eQ2bf4OlasEXb0Tg1367D2LXjTJNlKxZ6w6Xa0wXMaj?=
 =?us-ascii?Q?Tcwtzk7mvuMMcXjyAEGuUyDbBNFp8F17EG/wjZS0NZeptQB0kgmnmv71jjUl?=
 =?us-ascii?Q?XGSxDlyFsrrv7ylIhmGb+N4RMT+aGjR82jWECbPgS8K3dhHHkGqRF1fpqgoU?=
 =?us-ascii?Q?KbGVK+d4ddUW7z7s97vcNijr0ipuoOv/+WhljVIQook4mHIuF8dg90XszK9l?=
 =?us-ascii?Q?0pOlrUD5X0SlD+cx7+ZYAOBccFAAQgJhtWVnpedYJRSCGeaiao+wx7Iz5/Tm?=
 =?us-ascii?Q?MALvfLhePUfPJgNbWn4rbwM+m0AcWO+PNx/qXAbRXHYF3tx7T0kZIPIJ2qmv?=
 =?us-ascii?Q?UPIT62litDIqjj4Hyr4xLXuFMzF6vKkog7XyPrpBR9iCk2cCsnHPvhXeVhmE?=
 =?us-ascii?Q?x98Yh2j7hiws6YDsuBR+ANFk8cB3YQ00yBHdKvt2EMI1ewVqZTcOQ2wVEysS?=
 =?us-ascii?Q?2mkmJptZGTwksgvPYXPbCoyL8MlFyaNO9qTfrRh1pXIwQTwYyxNliDhu/IZw?=
 =?us-ascii?Q?iN5eZXMgse7XqP8fMSFHO1juaMJj/8arsQzdZErtRxTuArNX4kip3gnjW3Md?=
 =?us-ascii?Q?yOdJL29gvMDOj1s1ec2+WOrdYcEv0YD2cZ74XZnlig+hiH3uOqai6sa5H/E1?=
 =?us-ascii?Q?kqnn8BvBCKRM3ybxdpC+t4Y+0WiQBnD16bDqR8k1lw20XXO8gxLikOMCqdcV?=
 =?us-ascii?Q?hzAl5y6/PB+Rw1IYDpz9baLrc/IIWY+VPlRawWpiWRlyJ3b/dtXEC1V5BiQ9?=
 =?us-ascii?Q?4dNDqPN5EsLi56Z3tgBXs4FLiaVf/bBF2z2yX4ElKGehuPhElzpCwiE1dHI6?=
 =?us-ascii?Q?MCIHjawGalQX0YvmSWPwQ/dEaSWVa+lAgruxa+A8U1P97z4LT5WxvgZ+gx7w?=
 =?us-ascii?Q?3uEZ8v+IJM4lli5GZEvurlA/z9qQbThcCkB0k+JQPkil5K9IamBg2SDg68G0?=
 =?us-ascii?Q?CG1Gw3a9g+35WONHQrpJx/kSTFcetjIrfPb1U2klTMTMnJxiRNEOrkNDnmLg?=
 =?us-ascii?Q?Qa5cgAO2+QlPGa3LjBsSVI/ol07EiW2CrglHphqp2Cctryhi9IXPhSdVJBlF?=
 =?us-ascii?Q?yako2L63jEnofF72GoG3HmZKzu1VX/OjF3yONmDd?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fde6ca75-b463-44e1-c199-08db7d3ccdbb
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2023 09:47:10.7790
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: pSMxa0wnxcDdssy5RBZZ/foWOk67HYbj4nGVb07Z2bKpNq5sQwYJK9pqmkVnMsu2NaFvzaY2uhCsB8qzIEkkCA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYUPR06MB6219
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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