From patchwork Mon Jul 25 21:26:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 594007 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 EE0FEC433EF for ; Mon, 25 Jul 2022 21:27:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237277AbiGYV1C (ORCPT ); Mon, 25 Jul 2022 17:27:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237221AbiGYV1A (ORCPT ); Mon, 25 Jul 2022 17:27:00 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B72E240B6 for ; Mon, 25 Jul 2022 14:26:56 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id v5so7629712wmj.0 for ; Mon, 25 Jul 2022 14:26:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linexp-org.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+fP/YW6lKk1YJJQWc/7vmVyoV6adpF0oqi8olxQPTOI=; b=0feYwnXx3S2BBot69kmOpOTZrOsVcBHsOOlpGhAPFhioWbRVeQHiw/hj/JuMtOW/LV DwFre0nCZhvE/hFn5q5PLOu9okhYPqsKOU6CAEhCih7dgJSPKU2Ue+mAR1lsqagakOkr d++OwpTy0W0iW2VfW7XeTLxJfwBFFTJK8dWPTBFo0Ldiag2euoH79Yyl4iLlgJYW3Gdp DZAbZkHp/WDhpQucou3zO6xIcpVuLglLDwr3Xuf3mVIvoMUvJDLkU0kLe8oH3eMArfJQ UqkC73BCw9tFAWNyU5DkrrDdIZQifHXyD/yf18HM6OUPLyAhLvJ0cBU8knK6aasVbEXI WQeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+fP/YW6lKk1YJJQWc/7vmVyoV6adpF0oqi8olxQPTOI=; b=PAHbO0bbhB+xW8yqLu8xRWgxsTXh7MZ3l8u1jbFz0Ab/ZCAcgNUblJ/g+6xI+Jd6Gn xKn4A4LWmBbUaZQCqTe7N5HePFZl269qazE58NY8j1Kjm2tC7LmUlabWvMZhR3KBdpBA uD4VY2ZsE0Ik9ifcwJpqm51i2zt+BMT45enDSLaRKlytvOxoRjh+DppPRXjTT1xFdbe9 KJZf9JuW3r0IlIqvXm5D7Q76a1W6vux78Z+a6ygRPFGw2Gnfpum8ayALkbtqstB2jSmI yavNasQboCARQHkT1h7qDzFhKFG5oCttXAUX3RxnMvDOfoLtbrmyN0sJs4Gb9R8WcVX+ uaDQ== X-Gm-Message-State: AJIora8Q5R20g44YGNkRXN9w0LEz//Rgk9mFobp2iUa1J5kWhqBGNMtq XPsqet4HYU/qGITbSmH7CbNf4g== X-Google-Smtp-Source: AGRyM1vv+NfHkenD1U/kXF1SKD3HXOzTovyjxIVECBK7dlbN40kZjZRJ7zfmTEtYX0kW37/lnxex+g== X-Received: by 2002:a05:600c:1549:b0:3a3:2aa2:6f60 with SMTP id f9-20020a05600c154900b003a32aa26f60mr9660502wmg.57.1658784414975; Mon, 25 Jul 2022 14:26:54 -0700 (PDT) Received: from mai.box.freepro.com ([2a05:6e02:1041:c10:1780:8e54:dd38:6668]) by smtp.gmail.com with ESMTPSA id r17-20020a5d52d1000000b0021d68a504cbsm12668772wrv.94.2022.07.25.14.26.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 14:26:54 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, rafael@kernel.org Cc: rui.zhang@intel.com, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, khilman@baylibre.com, abailon@baylibre.com, lukasz.luba@arm.com, broonie@kernel.org, damien.lemoal@opensource.wdc.com, heiko@sntech.de, hayashi.kunihiko@socionext.com, mhiramat@kernel.org, talel@amazon.com, thierry.reding@gmail.com, digetx@gmail.com, jonathanh@nvidia.com, anarsoul@gmail.com, tiny.windzz@gmail.com, baolin.wang7@gmail.com, f.fainelli@gmail.com, bjorn.andersson@linaro.org, mcoquelin.stm32@gmail.com, glaroque@baylibre.com, miquel.raynal@bootlin.com, shawnguo@kernel.org, niklas.soderlund@ragnatech.se, matthias.bgg@gmail.com, j-keerthy@ti.com, Amit Kucheria Subject: [PATCH v2 02/32] thermal/of: Make new code and old code co-exist Date: Mon, 25 Jul 2022 23:26:07 +0200 Message-Id: <20220725212637.2818207-3-daniel.lezcano@linexp.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220725212637.2818207-1-daniel.lezcano@linexp.org> References: <20220725212637.2818207-1-daniel.lezcano@linexp.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org This transient change allows to use old and new OF together until all the drivers are converted to use the new OF API. This will go away when the old OF code will be removed. Signed-off-by: Daniel Lezcano --- drivers/thermal/thermal_core.c | 6 ------ drivers/thermal/thermal_of.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 0d9e9b175f93..a4783ab7eabd 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1495,10 +1495,6 @@ static int __init thermal_init(void) if (result) goto unregister_governors; - result = of_parse_thermal_zones(); - if (result) - goto unregister_class; - result = register_pm_notifier(&thermal_pm_nb); if (result) pr_warn("Thermal: Can not register suspend notifier, return %d\n", @@ -1506,8 +1502,6 @@ static int __init thermal_init(void) return 0; -unregister_class: - class_unregister(&thermal_class); unregister_governors: thermal_unregister_governors(); error: diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c index 7e7713c32e89..dbb450a9823c 100644 --- a/drivers/thermal/thermal_of.c +++ b/drivers/thermal/thermal_of.c @@ -485,6 +485,15 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data, { struct device_node *np, *child, *sensor_np; struct thermal_zone_device *tzd = ERR_PTR(-ENODEV); + static int old_tz_initialized; + int ret; + + if (!old_tz_initialized) { + ret = of_parse_thermal_zones(); + if (ret) + return ERR_PTR(ret); + old_tz_initialized = 1; + } np = of_find_node_by_name(NULL, "thermal-zones"); if (!np) @@ -1004,7 +1013,7 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) return ERR_PTR(ret); } -static __init void of_thermal_free_zone(struct __thermal_zone *tz) +static void of_thermal_free_zone(struct __thermal_zone *tz) { struct __thermal_bind_params *tbp; int i, j; @@ -1517,7 +1526,7 @@ EXPORT_SYMBOL_GPL(devm_thermal_of_zone_unregister); * Return: 0 on success, proper error code otherwise * */ -int __init of_parse_thermal_zones(void) +int of_parse_thermal_zones(void) { struct device_node *np, *child; struct __thermal_zone *tz;