From patchwork Tue Aug 23 12:43:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thermal-bot for Julien Panis X-Patchwork-Id: 600680 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 68164C32772 for ; Tue, 23 Aug 2022 16:22:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244503AbiHWQWl (ORCPT ); Tue, 23 Aug 2022 12:22:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244524AbiHWQWY (ORCPT ); Tue, 23 Aug 2022 12:22:24 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79919F8FC8 for ; Tue, 23 Aug 2022 05:43:09 -0700 (PDT) Date: Tue, 23 Aug 2022 12:43:06 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1661258587; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QmrJE1Z2uEOVAPtJb0AO7TiKPP+X/bkdYbDOdM/vVnA=; b=wYpohofrbUHOIX+pEjtQZ0b/m4z6id9zbO1+oGZ08hy391ssVTqqR3NAsvKgKvpWv8/MmE pV5KYh+v6H+JNpfaiWEDegmOQY8XL1ktMO2g5QZkDHpderLCT0imjQbYn4SSdeCkCE3CwF eA8Q4JFOs3wbCoffDKMzCc/wESU9tTl2mfF7c9ajtyqCohTchz5B3ORMw4Ez1L2VfhoC1K W92uwDUtjTxMtcZ2BFtIbGb9jHVJhdrp9NVSY2TYKxaZRXJ8bvbCDmgzfec018qeBtwtP7 JR8CKooOApqIi3bSc3bcAK/jHo5MV47u3FG0l9pyrYRdBYCoBmtHTF8menCMkw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1661258587; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QmrJE1Z2uEOVAPtJb0AO7TiKPP+X/bkdYbDOdM/vVnA=; b=1gxo3lfW2pw8pC86JRvt+NsZ3zVzKK8WQNgvEphLHlfIwoLA52po4cI6M+etkDLv2knZ6P tQStHVWbe5WH0FBA== From: "thermal-bot for Daniel Lezcano" Sender: tip-bot2@linutronix.de Reply-to: linux-pm@vger.kernel.org To: linux-pm@vger.kernel.org Subject: [thermal: thermal/next] thermal/drivers/amlogic: Switch to new of API Cc: Daniel Lezcano , Neil Armstrong , Daniel Lezcano , rui.zhang@intel.com, amitk@kernel.org In-Reply-To: <20220804224349.1926752-14-daniel.lezcano@linexp.org> References: <20220804224349.1926752-14-daniel.lezcano@linexp.org> MIME-Version: 1.0 Message-ID: <166125858657.401.13231781709789777161.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The following commit has been merged into the thermal/next branch of thermal: Commit-ID: 1240fd6512b7df593b99ea777c846f0b59173a6b Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//1240fd6512b7df593b99ea777c846f0b59173a6b Author: Daniel Lezcano AuthorDate: Fri, 05 Aug 2022 00:43:29 +02:00 Committer: Daniel Lezcano CommitterDate: Wed, 17 Aug 2022 14:09:38 +02:00 thermal/drivers/amlogic: Switch to new of API 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 Link: https://lore.kernel.org/r/20220804224349.1926752-14-daniel.lezcano@linexp.org Reviewed-by: Neil Armstrong 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 e61b91d..d30cb79 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);