Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp6201670rwb; Wed, 18 Jan 2023 02:24:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXudPUaqnucF3dMRZlnsexhC370aofbKnUtVnqfL4LojTGIuH8Y2KUsf8ZYCkZw1lD6RHLRc X-Received: by 2002:a05:6a00:2354:b0:580:cf1a:f2b5 with SMTP id j20-20020a056a00235400b00580cf1af2b5mr9865565pfj.12.1674037491034; Wed, 18 Jan 2023 02:24:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674037491; cv=none; d=google.com; s=arc-20160816; b=w19v2x5l6yo+MpUhkcgk8mKcVhj7WumQ7vRar1vm1dtKcXl0kupJHOMsE7T/BsqrQ/ XuSZkN4kj8R13caItSux1Qw4Zm+8+mEwrJtkrcagyr4TLxQaz2TedJVmmYG9+uLEvqC3 CGwN+d2k7U5EefiMKiVvmPCgtcLNzMv8WVWJax9XB29eXfpE1Icb1SN/DV1pTaeBYudN QzKzRCIP5bTbEBZ/QLoh1yIHLImxV9ZKrqzTLEz/KGl3EEJ2F+EJLfKzg2W2Ro+74fVR UlrIqxqved7Qj+ImhWWDAAgaN9FaRv6oR9VoALJ1NS8kAqBhoxE02yhwJVoBgfBPrMaT 6cJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=4j626TCb5sSK6/O9BNAoP9I9bB8KkcMrh2xVfyp7Ktg=; b=ZafFgrgbTMjR2+8GwB/CBYoiqF6V+ciLMwEwSJj5QD1inYbIp4i/b2h9MEkbdUZDs7 UDo3FeiO9S34NWH3mKWUjOFpsqG5Gnn0F841pr2lIyHIgWQZOoM8E/Ual2U3xquLh+UB nAefXYEVphV7QuieKu23BCYbfBPIUfJBsRQL7yUmTcWpLrNmv+sscv1Rp4NFsxnQ5UNq g2qDhKyXwaHyBeX7mlgxgxHfPNcqgIU25IYToyK050FJdUcpldq+bQbcioRC6lrofJ+a MfTxPK/xMa5Xa/X19cp8wk4RXs0Vwify7KxowkAxUipWwSoGlzOBhnyelcPFdmruoaFS T4sw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n184-20020a6227c1000000b005634d0b379dsi32881080pfn.115.2023.01.18.02.24.45; Wed, 18 Jan 2023 02:24:51 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229553AbjARJXJ (ORCPT + 45 others); Wed, 18 Jan 2023 04:23:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230213AbjARJU3 (ORCPT ); Wed, 18 Jan 2023 04:20:29 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8A2038B60; Wed, 18 Jan 2023 00:37:56 -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 4NxfKG2Wkwz508D2; Wed, 18 Jan 2023 16:37:54 +0800 (CST) Received: from xaxapp02.zte.com.cn ([10.88.97.241]) by mse-fl1.zte.com.cn with SMTP id 30I8bi8n021856; Wed, 18 Jan 2023 16:37:44 +0800 (+08) (envelope-from ye.xingchen@zte.com.cn) Received: from mapi (xaxapp01[null]) by mapi (Zmail) with MAPI id mid31; Wed, 18 Jan 2023 16:37:47 +0800 (CST) Date: Wed, 18 Jan 2023 16:37:47 +0800 (CST) X-Zmail-TransId: 2af963c7afdbffffffffa170dd25 X-Mailer: Zmail v1.0 Message-ID: <202301181637472073620@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , , Subject: =?UTF-8?B?W1BBVENIXSB0aGVybWFsL2RyaXZlcnMvbXRrX3RoZXJtYWw6IFVzZcKgZGV2bV9wbGF0Zm9ybV9nZXRfYW5kX2lvcmVtYXBfcmVzb3VyY2UoKQ==?= Content-Type: text/plain; charset="UTF-8" X-MAIL: mse-fl1.zte.com.cn 30I8bi8n021856 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.138.novalocal with ID 63C7AFE2.000 by FangMail milter! X-FangMail-Envelope: 1674031074/4NxfKG2Wkwz508D2/63C7AFE2.000/10.5.228.132/[10.5.228.132]/mse-fl1.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63C7AFE2.000/4NxfKG2Wkwz508D2 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, T_SPF_PERMERROR,UNPARSEABLE_RELAY 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: X-Mailing-List: linux-kernel@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/thermal/mtk_thermal.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c index 0084b76493d9..9a8b107900e9 100644 --- a/drivers/thermal/mtk_thermal.c +++ b/drivers/thermal/mtk_thermal.c @@ -990,7 +990,6 @@ static int mtk_thermal_probe(struct platform_device *pdev) int ret, i, ctrl_id; struct device_node *auxadc, *apmixedsys, *np = pdev->dev.of_node; struct mtk_thermal *mt; - struct resource *res; u64 auxadc_phys_base, apmixed_phys_base; struct thermal_zone_device *tzdev; void __iomem *apmixed_base, *auxadc_base; @@ -1009,8 +1008,7 @@ static int mtk_thermal_probe(struct platform_device *pdev) if (IS_ERR(mt->clk_auxadc)) return PTR_ERR(mt->clk_auxadc); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - mt->thermal_base = devm_ioremap_resource(&pdev->dev, res); + mt->thermal_base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL); if (IS_ERR(mt->thermal_base)) return PTR_ERR(mt->thermal_base); -- 2.25.1