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:     Wolfram Sang <wsa+renesas@sang-engineering.com>,
        Andi Shyti <andi.shyti@kernel.org>
Cc:     Yangtao Li <frank.li@vivo.com>, linux-renesas-soc@vger.kernel.org,
        linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 08/11] i2c: sh_mobile: Use devm_platform_get_and_ioremap_resource()
Date:   Mon, 10 Jul 2023 14:33:47 +0800
Message-Id: <20230710063351.17490-8-frank.li@vivo.com>
In-Reply-To: <20230710063351.17490-1-frank.li@vivo.com>
References: <20230710063351.17490-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?rAqrp5Bdwi2IDHV+kkeD94DcChMx2uxlQL8wc+S5zKKQ1xcERVYgWAjW+Zh3?=
 =?us-ascii?Q?T4mUDtJN8879n7nBaJ68N5IVbcwu8YvY4H20V4579GELFpZIKqG/KItShgt7?=
 =?us-ascii?Q?lMPaPV4DtML0xCFo+Jf7LDyzW9ZmFllxCDqCb1AZAk+vGaa4Igxl9YWimCrC?=
 =?us-ascii?Q?CS6BESt7qNXJw+deSAkSC7Lu3ZPfcpDZTPAonbICTBP6OeKFicl1JX04TMm+?=
 =?us-ascii?Q?jP4nPdditPQ8zgPjLQRsxQBFI/eKzRgG5fKcth+coDZL2vR0zPWsDowM0Auz?=
 =?us-ascii?Q?oieKTW/D4CHejhLuDelulTipu5h7ES9BFDUxGgOFTDxS2M/2dTo+N91Ngjdx?=
 =?us-ascii?Q?wU0keD1itdmxGdxFJ67uZeTpM8zVdpbxYl50FUuTq7gon6zZrJOSdSreQ6hv?=
 =?us-ascii?Q?Le7cB/6bBH1Jg2xPS35jcQi6rPxRKfhH470jnpNWSHPCDhDll+4FmEP4H9ew?=
 =?us-ascii?Q?fi5T5bhDuQQVvc9j3pstKRX1REKRamEuas3Zghdb+2ael0V515yK3d9mfAzq?=
 =?us-ascii?Q?pt/TunWieELOnPOa6ol7j9O/5DOCjCpJDDiAsz5oZq9ucXr9LwKLm5ZeItn5?=
 =?us-ascii?Q?37NGflP3kWUuo7CsLYRK0hOSqShRE4SS+7HF/laKLRE6+PhGmjxbG9u819dW?=
 =?us-ascii?Q?9oUD1ijOUVEQj/DoJO67JJY1yQI1r+W1QgHl+N15gm7ZuFThsYlV9ssMo+HH?=
 =?us-ascii?Q?K9z+E4SnzQ3Jl7Py5lVcLSqhy1KK3vd2CbxZ7nLkI4NtBEj+sTApZb57JIMf?=
 =?us-ascii?Q?m/jfhoINYhsH8ySa4TT2H0PMG8H1h1khUY0+Nd5Bq8fpToHzoKmhDqcyg1Hy?=
 =?us-ascii?Q?2folr1Qi+mPjB/7f3xIKPRApZSFqTaDrWT93deSPBs1LHQkEDlOWVJrD8xJ8?=
 =?us-ascii?Q?XZgbjouLzIlfCeTgt6Uhn28z5E/Wy87frmmH0kv0I7cON7CU2yPmdDYjBfkj?=
 =?us-ascii?Q?9VpAYG/AH8Lvaujw0phrSZLirR8utsYYa1mFEqc4O8o+YbJiUfF72171/Pdz?=
 =?us-ascii?Q?6cihciZWibvVzD50U0CxbLqQe35oAJMqqla699b7nOKh29l3XDGQF4IriOOB?=
 =?us-ascii?Q?Un2u5zTa2am+9r1ecKXS0hLSkQPna8EXt8/8w1UJ+oLbOrsfLE3YZMaDKen9?=
 =?us-ascii?Q?6+au0/sBlf3pQQvJWObs3ZnHWke8PRccL/Ugaa6xc6D6d23vAyAkdSyccoBV?=
 =?us-ascii?Q?Wv40cSOxoFMTYvEtEOYJXNsYCybGb70cxw3LI4Fh/UHd/kMbqSGZPwonBAZe?=
 =?us-ascii?Q?/HxemCxo7hro8F6NJ5WRvvnzceWmoXGb4MhEkDtUsEu9Kq82BPysbtkJTFpe?=
 =?us-ascii?Q?JocX5qUdO48lfq25sRXxfF8i0saUdjvx8aSubtuyUjT9uIvUjxHSi7SzA0UR?=
 =?us-ascii?Q?dtdbZszjn7QvjnOIfTtJT80ULYsYvz5BKzGtlOCYq+eb3PrU4++3CMMoCCuP?=
 =?us-ascii?Q?KiQigq8e0lCP9szvTGYjTOyVD3fyd6OCCDW0w+ElQlFgPSaM444VUJmcg127?=
 =?us-ascii?Q?Nw8NVHmvqCKfMN2CItFfRAI+SHEzLqByeGLsGk5vwcMDtRyrmAkAS9sQPt8P?=
 =?us-ascii?Q?e5fLf0wf0tra7KP6zO4n3nILRA9En3khg2kBLoYk?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d3b6e916-187b-47cf-b256-08db810fb086
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2023 06:34:19.0755
 (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: 6sQQ9iHIdsMAri/UivAQTCJ3YrJpMz8cLpYBAJGAI2NkP3URMD710iwzbB+fBfwfFr0yBhWnR3/MMfIZ3n/+OQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6586
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_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        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

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.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
v2:
-s/devm_platform_get_and_ioremap_resource(pdev/devm_platform_get_and_ioremap_resource(dev
 drivers/i2c/busses/i2c-sh_mobile.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index 21717b943a9e..163fc118873f 100644
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -871,7 +871,6 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
 {
 	struct sh_mobile_i2c_data *pd;
 	struct i2c_adapter *adap;
-	struct resource *res;
 	const struct sh_mobile_dt_config *config;
 	int ret;
 	u32 bus_speed;
@@ -893,10 +892,7 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
 	pd->dev = &dev->dev;
 	platform_set_drvdata(dev, pd);
 
-	res = platform_get_resource(dev, IORESOURCE_MEM, 0);
-
-	pd->res = res;
-	pd->reg = devm_ioremap_resource(&dev->dev, res);
+	pd->reg = devm_platform_get_and_ioremap_resource(dev, 0, &pd->res);
 	if (IS_ERR(pd->reg))
 		return PTR_ERR(pd->reg);
 
@@ -905,7 +901,7 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
 	pd->clks_per_count = 1;
 
 	/* Newer variants come with two new bits in ICIC */
-	if (resource_size(res) > 0x17)
+	if (resource_size(pd->res) > 0x17)
 		pd->flags |= IIC_FLAG_HAS_ICIC67;
 
 	pm_runtime_enable(&dev->dev);
-- 
2.39.0