From patchwork Sat Jan 28 08:08:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ye.xingchen@zte.com.cn X-Patchwork-Id: 13119738 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A07F5C38142 for ; Sat, 28 Jan 2023 08:08:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229619AbjA1IIe (ORCPT ); Sat, 28 Jan 2023 03:08:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230104AbjA1IIe (ORCPT ); Sat, 28 Jan 2023 03:08:34 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C0FBEB6C; Sat, 28 Jan 2023 00:08:33 -0800 (PST) Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4P3nBm0684z8QrkZ; Sat, 28 Jan 2023 16:08:32 +0800 (CST) Received: from xaxapp03.zte.com.cn ([10.88.97.17]) by mse-fl1.zte.com.cn with SMTP id 30S88QPM012068; Sat, 28 Jan 2023 16:08:26 +0800 (+08) (envelope-from ye.xingchen@zte.com.cn) Received: from mapi (xaxapp01[null]) by mapi (Zmail) with MAPI id mid31; Sat, 28 Jan 2023 16:08:28 +0800 (CST) Date: Sat, 28 Jan 2023 16:08:28 +0800 (CST) X-Zmail-TransId: 2af963d4d7fc399ade1d X-Mailer: Zmail v1.0 Message-ID: <202301281608287301370@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , Subject: =?utf-8?b?W1BBVENIXSBJbnB1dDogb2xwY19hcHNwIC0gVXNlwqBkZXZtX3BsYXRm?= =?utf-8?b?b3JtX2dldF9hbmRfaW9yZW1hcF9yZXNvdXJjZSgp?= X-MAIL: mse-fl1.zte.com.cn 30S88QPM012068 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.137.novalocal with ID 63D4D800.000 by FangMail milter! X-FangMail-Envelope: 1674893312/4P3nBm0684z8QrkZ/63D4D800.000/10.5.228.132/[10.5.228.132]/mse-fl1.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63D4D800.000/4P3nBm0684z8QrkZ Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: ye xingchen 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: ye xingchen --- drivers/input/serio/olpc_apsp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/input/serio/olpc_apsp.c b/drivers/input/serio/olpc_apsp.c index 04d2db982fb8..33a8e5889bd8 100644 --- a/drivers/input/serio/olpc_apsp.c +++ b/drivers/input/serio/olpc_apsp.c @@ -169,7 +169,6 @@ static int olpc_apsp_probe(struct platform_device *pdev) { struct serio *kb_serio, *pad_serio; struct olpc_apsp *priv; - struct resource *res; int error; priv = devm_kzalloc(&pdev->dev, sizeof(struct olpc_apsp), GFP_KERNEL); @@ -178,8 +177,7 @@ static int olpc_apsp_probe(struct platform_device *pdev) priv->dev = &pdev->dev; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - priv->base = devm_ioremap_resource(&pdev->dev, res); + priv->base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL); if (IS_ERR(priv->base)) { dev_err(&pdev->dev, "Failed to map WTM registers\n"); return PTR_ERR(priv->base);