From patchwork Mon Aug 1 21:22:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 594809 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 D4AEAC00144 for ; Mon, 1 Aug 2022 21:24:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234894AbiHAVYq (ORCPT ); Mon, 1 Aug 2022 17:24:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234819AbiHAVYS (ORCPT ); Mon, 1 Aug 2022 17:24:18 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A7E747B85 for ; Mon, 1 Aug 2022 14:23:45 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id z17so10923137wrq.4 for ; Mon, 01 Aug 2022 14:23:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linexp-org.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=YLbrdXUnmrQegHQ4ArILFVac507m4xUt/E4MiWL2p00=; b=6C15rnP4qts5mxMDjMldb86oCUjNi29lWZpNRT6hk1fFOPjDtK3NhIdyS8d4/skgsm 97jsLwiozQwzrRAQKvE3u1G10h87gwDomYFVpQyo1yLFe0mQhKbnVRlP6UXjN8OT1z7o Jo/Z2Cn3W6AUDu266wHTMXLk+012Xp4Cxmcqt7FJ6fTzbm6Jg9QjwhzYQu6+x3uTiMpr ZObq1X9RBBlO4LpXqXONnPMMpF08whbc9bL6r4wXLVE/hrYTZf7P+pU9xp9wKft6LAa9 7JsPbV4+KIhcPIzX5FP3EHhdI/lCmQte2zI1GuApAE0VjqNdmBDcgD2C9yF3xcBAgCXq N/Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=YLbrdXUnmrQegHQ4ArILFVac507m4xUt/E4MiWL2p00=; b=2VOhKA6THuYAqnq+HRqhMEFp4ZG7q8mWxzmCxwNUutfYaCezOu5Dg8yl/E8Px+QPl6 OblCm8IyIJGxi+c/EdI6rN0qMIuY6OOSt5XWP3pUoHOMXxyfJbULRaJJ4weHsugydCY3 uiuWnKYuKc4vtI0JIlQe/TdF//cMQBDwU0hEkvtXqCIGEHdZWGmQVa7x/bgt+A1dP20D ZPRgtUgv1Zgy0wM2V4F4NST+qmP7SNGvkJP+coo1VxRYFuZkDM73Mra/3bmlbxvDzRM/ EKPhiJj8RG1uMsfzfjcbNNNV5H3A5Jq5Rt7HXPKOaN1sqJsTCCuiU7Do9hoDMNjeFQxA F9TA== X-Gm-Message-State: ACgBeo3/ILU/2GQXjXnkDjZdTbVbhjLRPwyDMdu09T6rPFmwrusqHYCj m7Qk99wTpaU2y+QGVNsXXDdIAQ== X-Google-Smtp-Source: AA6agR5p4m1l+Ki819toRStoUeO4N92jCT4xbpy9RHRaR8/56BiK0/60qNayKRhiE6Svt2ResUNTTA== X-Received: by 2002:adf:e588:0:b0:21f:ace:dd82 with SMTP id l8-20020adfe588000000b0021f0acedd82mr11080482wrm.226.1659389018150; Mon, 01 Aug 2022 14:23:38 -0700 (PDT) Received: from mai.box.freepro.com ([2a05:6e02:1041:c10:d00:ceb8:9c09:1302]) by smtp.gmail.com with ESMTPSA id c7-20020adffb07000000b0021e501519d3sm12995285wrr.67.2022.08.01.14.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Aug 2022 14:23:37 -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 , linux-amlogic@lists.infradead.org (open list:THERMAL DRIVER FOR AMLOGIC SOCS) Subject: [PATCH v4 13/32] thermal/drivers/amlogic: Switch to new of API Date: Mon, 1 Aug 2022 23:22:25 +0200 Message-Id: <20220801212244.1124867-14-daniel.lezcano@linexp.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220801212244.1124867-1-daniel.lezcano@linexp.org> References: <20220801212244.1124867-1-daniel.lezcano@linexp.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The thermal OF code has a new API allowing to migrate the OF initialization to a simpler approach. The ops are no longer device tree specific and are the generic ones provided by the core code. Convert the ops to the thermal_zone_device_ops format and use the new API to register the thermal zone with these generic ops. Signed-off-by: Daniel Lezcano --- drivers/thermal/amlogic_thermal.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/thermal/amlogic_thermal.c b/drivers/thermal/amlogic_thermal.c index e61b91d14ad1..d30cb791e63c 100644 --- a/drivers/thermal/amlogic_thermal.c +++ b/drivers/thermal/amlogic_thermal.c @@ -179,12 +179,12 @@ static int amlogic_thermal_disable(struct amlogic_thermal *data) return 0; } -static int amlogic_thermal_get_temp(void *data, int *temp) +static int amlogic_thermal_get_temp(struct thermal_zone_device *tz, int *temp) { unsigned int tval; - struct amlogic_thermal *pdata = data; + struct amlogic_thermal *pdata = tz->devdata; - if (!data) + if (!pdata) return -EINVAL; regmap_read(pdata->regmap, TSENSOR_STAT0, &tval); @@ -195,7 +195,7 @@ static int amlogic_thermal_get_temp(void *data, int *temp) return 0; } -static const struct thermal_zone_of_device_ops amlogic_thermal_ops = { +static const struct thermal_zone_device_ops amlogic_thermal_ops = { .get_temp = amlogic_thermal_get_temp, }; @@ -276,10 +276,10 @@ static int amlogic_thermal_probe(struct platform_device *pdev) return PTR_ERR(pdata->sec_ao_map); } - pdata->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, - 0, - pdata, - &amlogic_thermal_ops); + pdata->tzd = devm_thermal_of_zone_register(&pdev->dev, + 0, + pdata, + &amlogic_thermal_ops); if (IS_ERR(pdata->tzd)) { ret = PTR_ERR(pdata->tzd); dev_err(dev, "Failed to register tsensor: %d\n", ret);