From patchwork Tue Aug 23 12:42:50 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: 600688 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 786D3C32774 for ; Tue, 23 Aug 2022 16:22:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240769AbiHWQWc (ORCPT ); Tue, 23 Aug 2022 12:22:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244680AbiHWQWC (ORCPT ); Tue, 23 Aug 2022 12:22:02 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10BB410AE2B for ; Tue, 23 Aug 2022 05:42:53 -0700 (PDT) Date: Tue, 23 Aug 2022 12:42:50 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1661258571; 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=Q7uCdJnw1kGPj3iqPW4uY7m32tGFfWoMS7Iu5tZKaGY=; b=nwmiAEPDUCxeLj9WLAuiryYvAphDnUv3JUcUmTkFPx+3k/LiOat+SZegic6GCgPggK9OCE Pmb10cXjGjUDQzwVNt+y7lJ6TwVdPqmArmG+aCJ+tzGTYmlNRZtnhgrDv0LzmygKy/2gBL p/UWkIYJcWLXgOjQJPBd+kETBOjlm/e4T4Hc0OYvN3gIkgiFzr0IqUGBs+vY9yZsPecMEu WEqHrT60zQuBBgUwhmfszy65Est2XvdxA/kMPnxjyysW0oQgE+TYwoksnWc7QG9SoZu95u +YhkZbgaXrBxumbf5/zGpXEDidpYPoy4Dk+KX4ZMDAW+8YezRXkgoCUiYp2oqw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1661258571; 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=Q7uCdJnw1kGPj3iqPW4uY7m32tGFfWoMS7Iu5tZKaGY=; b=am1sm5b2+Vt1lBf22GAaXlf24+upIBL0tUOQVMoaQUjxCQMTrVt+eNqYyBSDRvMdhFwfQK IEgQABr+1iom3JDw== 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] Input: sun4i-ts - switch to new of thermal API Cc: Daniel Lezcano , Dmitry Torokhov , Jernej Skrabec , Daniel Lezcano , rui.zhang@intel.com, amitk@kernel.org In-Reply-To: <20220804224349.1926752-30-daniel.lezcano@linexp.org> References: <20220804224349.1926752-30-daniel.lezcano@linexp.org> MIME-Version: 1.0 Message-ID: <166125857032.401.14105278814644879256.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: ad662b1d606515a048cef06c025dfb150cebaa8d Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//ad662b1d606515a048cef06c025dfb150cebaa8d Author: Daniel Lezcano AuthorDate: Fri, 05 Aug 2022 00:43:45 +02:00 Committer: Daniel Lezcano CommitterDate: Wed, 17 Aug 2022 14:09:39 +02:00 Input: sun4i-ts - switch to new of thermal 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 Acked-by: Dmitry Torokhov Acked-by: Jernej Skrabec Link: https://lore.kernel.org/r/20220804224349.1926752-30-daniel.lezcano@linexp.org Signed-off-by: Daniel Lezcano --- drivers/input/touchscreen/sun4i-ts.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/input/touchscreen/sun4i-ts.c b/drivers/input/touchscreen/sun4i-ts.c index 742a7e9..73eb8f8 100644 --- a/drivers/input/touchscreen/sun4i-ts.c +++ b/drivers/input/touchscreen/sun4i-ts.c @@ -192,12 +192,12 @@ static int sun4i_get_temp(const struct sun4i_ts_data *ts, int *temp) return 0; } -static int sun4i_get_tz_temp(void *data, int *temp) +static int sun4i_get_tz_temp(struct thermal_zone_device *tz, int *temp) { - return sun4i_get_temp(data, temp); + return sun4i_get_temp(tz->devdata, temp); } -static const struct thermal_zone_of_device_ops sun4i_ts_tz_ops = { +static const struct thermal_zone_device_ops sun4i_ts_tz_ops = { .get_temp = sun4i_get_tz_temp, }; @@ -356,8 +356,8 @@ static int sun4i_ts_probe(struct platform_device *pdev) if (IS_ERR(hwmon)) return PTR_ERR(hwmon); - thermal = devm_thermal_zone_of_sensor_register(ts->dev, 0, ts, - &sun4i_ts_tz_ops); + thermal = devm_thermal_of_zone_register(ts->dev, 0, ts, + &sun4i_ts_tz_ops); if (IS_ERR(thermal)) return PTR_ERR(thermal);