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;
Date:   Fri, 11 Nov 2022 16:45:14 +0800 (CST)
Message-ID: <202211111645144926643@zte.com.cn>
Mime-Version: 1.0
From:   <ye.xingchen@zte.com.cn>
To:     <linux-kernel@vger.kernel.org>
Cc:     <chi.minghao@zte.com.cn>
Subject: =?UTF-8?B?W1BBVENIXSBidXM6IG9tYXAtb2NwMnNjcDogdXNlCgogZGV2bV9wbGF0Zm9ybV9nZXRfYW5kX2lvcmVtYXBfcmVzb3VyY2UoKQ==?=
Content-Type: text/plain;
        charset="UTF-8"
Precedence: bulk

From: Minghao Chi <chi.minghao@zte.com.cn>

Convert platform_get_resource(), devm_ioremap_resource() to a single
call to devm_platform_get_and_ioremap_resource(), as this is exactly
what this function does.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
---
 drivers/bus/omap-ocp2scp.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/bus/omap-ocp2scp.c b/drivers/bus/omap-ocp2scp.c
index e02d0656242b..c8707c491c37 100644
--- a/drivers/bus/omap-ocp2scp.c
+++ b/drivers/bus/omap-ocp2scp.c
@@ -31,7 +31,6 @@ static int omap_ocp2scp_probe(struct platform_device *pdev)
 	int ret;
 	u32 reg;
 	void __iomem *regs;
-	struct resource *res;
 	struct device_node *np = pdev->dev.of_node;

 	if (np) {
@@ -58,8 +57,7 @@ static int omap_ocp2scp_probe(struct platform_device *pdev)
 	 * of SYNC2 parameter in OCP2SCP. Suggested reset value is 0x6 or more.
 	 */
 	if (!of_device_is_compatible(np, "ti,am437x-ocp2scp")) {
-		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-		regs = devm_ioremap_resource(&pdev->dev, res);
+		regs = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
 		if (IS_ERR(regs)) {
 			ret = PTR_ERR(regs);
 			goto err1;
-- 
2.25.1