From patchwork Wed Jan 18 15:40:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 45341 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2408063wrn; Wed, 18 Jan 2023 07:45:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXsfDis9tPmsQkycoIuBxh1S0hf7MVEy4k+3PdasOPdD1Sv8j63q5hv3xsQGcZ8pukI6q8NH X-Received: by 2002:a17:906:1787:b0:870:94e:13ee with SMTP id t7-20020a170906178700b00870094e13eemr6843283eje.66.1674056721387; Wed, 18 Jan 2023 07:45:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674056721; cv=none; d=google.com; s=arc-20160816; b=ZMfZ1m09kRJNtxv+Q+gjCCDondzTvdiPhHod4JEZQVfHFPrth1FeY0AEUNdaoztoOo SekzSwpNeE5xH0P+pjUxiEsHiGxXqWGtLTFr6K+YHSvaDRiLuywJsOjosuAkjhnfokgH 2pnk6gPkNwf1OXR1sH4PCrHt2UhCy6rYRTi2bjzRsQctq3QYO6bsT3wzztvlE0eaAmaX VBOQCaQviqbKwvkNyFoxZP0QehZokEc21+ghBC4o5lBnRU52Tg1xRSeYpe3WCndoGDLe 0yRw6SGiuWtHRx/1fr1wjyaYa6lzPE6de6kPCCCtkDQ7LqS7HzE5ygIQzCcHVyR6UIp/ vMvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=o78476BCBNeXUUh8dYtk1P5K0AodHpMpcG8B/jLfRgU=; b=kcgzklotmQVWyBXVI0HfN3kQ9JeOF2A5gJd7+zo7t+zGgd6xOdiOaSqGjcSFPzOlvN PEmQrheBhGEIzeuPIy/Ma63sJvHb913qcam6Qw73zoRBgOt2akRxSZOnUCKrVRrE8zAm Qn0nwO7uJ1kPgjMJnQK/OiZ9i75kDTFJgWtl/435gTn8Qz3AtyFS/f8F2PWBkccA+L1X gdn5ylt3x/+uVBJofgLLYNHLl8E7pkpygUlMuRQ1w5W3BKJjVubqBDVVGL2WaUjVqvk+ LqdBpDmo3g5aCW0JYkN36jvyuA7wBOnIZKhaFiT4VLLxi03xx82WHyHeK05vmOhgGafJ WjHA== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nb4-20020a1709071c8400b0084d45d12a9csi28132501ejc.396.2023.01.18.07.44.55; Wed, 18 Jan 2023 07:45:21 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230212AbjARPku (ORCPT + 99 others); Wed, 18 Jan 2023 10:40:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230183AbjARPks (ORCPT ); Wed, 18 Jan 2023 10:40:48 -0500 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC0BE6A6F; Wed, 18 Jan 2023 07:40:46 -0800 (PST) Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from ) id 1pIAYP-0007gi-0q; Wed, 18 Jan 2023 16:40:45 +0100 Date: Wed, 18 Jan 2023 15:40:39 +0000 From: Daniel Golle To: AngeloGioacchino Del Regno , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui , Matthias Brugger , Rob Herring Cc: Steven Liu , Henry Yen , Chad Monroe , John Crispin Subject: [PATCH v5 1/2] thermal/drivers/mtk: use function pointer for raw_to_mcelsius Message-ID: <69c17529e8418da3eec703dde31e1b01e5b0f7e8.1674055882.git.daniel@makrotopia.org> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755375700330346781?= X-GMAIL-MSGID: =?utf-8?q?1755375700330346781?= Instead of having if-else logic selecting either raw_to_mcelsius_v1 or raw_to_mcelsius_v2 in mtk_thermal_bank_temperature introduce a function pointer raw_to_mcelsius to struct mtk_thermal which is initialized in the probe function. Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Daniel Golle Reviewed-by: Matthias Brugger --- drivers/thermal/mtk_thermal.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c index 0084b76493d9a..992750ee09e62 100644 --- a/drivers/thermal/mtk_thermal.c +++ b/drivers/thermal/mtk_thermal.c @@ -292,6 +292,8 @@ struct mtk_thermal { const struct mtk_thermal_data *conf; struct mtk_thermal_bank banks[MAX_NUM_ZONES]; + + int (*raw_to_mcelsius)(struct mtk_thermal *mt, int sensno, s32 raw); }; /* MT8183 thermal sensor data */ @@ -656,13 +658,9 @@ static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank) for (i = 0; i < conf->bank_data[bank->id].num_sensors; i++) { raw = readl(mt->thermal_base + conf->msr[i]); - if (mt->conf->version == MTK_THERMAL_V1) { - temp = raw_to_mcelsius_v1( - mt, conf->bank_data[bank->id].sensors[i], raw); - } else { - temp = raw_to_mcelsius_v2( - mt, conf->bank_data[bank->id].sensors[i], raw); - } + temp = mt->raw_to_mcelsius( + mt, conf->bank_data[bank->id].sensors[i], raw); + /* * The first read of a sensor often contains very high bogus @@ -1075,6 +1073,11 @@ static int mtk_thermal_probe(struct platform_device *pdev) mtk_thermal_release_periodic_ts(mt, auxadc_base); } + if (mt->conf->version == MTK_THERMAL_V1) + mt->raw_to_mcelsius = raw_to_mcelsius_v1; + else + mt->raw_to_mcelsius = raw_to_mcelsius_v2; + for (ctrl_id = 0; ctrl_id < mt->conf->num_controller ; ctrl_id++) for (i = 0; i < mt->conf->num_banks; i++) mtk_thermal_init_bank(mt, i, apmixed_phys_base,