From mboxrd@z Thu Jan 1 00:00:00 1970 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 C53F9C38142 for ; Tue, 23 Aug 2022 16:22:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244592AbiHWQWk (ORCPT ); Tue, 23 Aug 2022 12:22:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244503AbiHWQWY (ORCPT ); Tue, 23 Aug 2022 12:22:24 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DEF39E2D4 for ; Tue, 23 Aug 2022 05:43:08 -0700 (PDT) Date: Tue, 23 Aug 2022 12:43:05 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1661258586; 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=DLHbDPzvJ9hyHiF3lz4wRS2o9QP6IcHTF4ktj/F2N+s=; b=qhKTy/Ycc2n6X9y80M0j/gzkcchMBYvij/NBU1iVH6cCnl8YjNwfTI3jW/yblIUou7iQDK lUnRhvDk2+yPCxitGS0dJA6eolbPNTwNQAsFGEnenNCLskv6raj2DNf/s8aW1vtU1kz0gv gkyQNBMKiZXYx65ETibfwIwvqXUS1iubn6qapqvujI+Wk4e3sJxcJsySH7IrcMZbjKHUm3 JQeZv8Y3XkY91Hskg2dcwIIQqgxvuFzr/Z6amZ0OzmYECQQov6La28dnb0hXPIyIIDa0uD B5tXFa9GGf+U1xK+7o1aseYng8YQy29OJIXtlPIdy+rMdZ78r39AwedPOrUcDQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1661258586; 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=DLHbDPzvJ9hyHiF3lz4wRS2o9QP6IcHTF4ktj/F2N+s=; b=3La3d+AmH7D/jLk1GXEQ/nwJ4lV4PGti41QZIbFHV3CiBQBrKeRdZB4GpU0RqbucbPrqUx Cq04l8Ohp/YDEIDA== 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/armada: Switch to new of API Cc: Daniel Lezcano , Daniel Lezcano , rui.zhang@intel.com, amitk@kernel.org In-Reply-To: <20220804224349.1926752-15-daniel.lezcano@linexp.org> References: <20220804224349.1926752-15-daniel.lezcano@linexp.org> MIME-Version: 1.0 Message-ID: <166125858558.401.17538971671357138095.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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: e4a1150e3e8d708e989c9f7056320fbff4a2d0c4 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//e4a1150e3e8d708e989c9f7056320fbff4a2d0c4 Author: Daniel Lezcano AuthorDate: Fri, 05 Aug 2022 00:43:30 +02:00 Committer: Daniel Lezcano CommitterDate: Wed, 17 Aug 2022 14:09:38 +02:00 thermal/drivers/armada: 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-15-daniel.lezcano@linexp.org Signed-off-by: Daniel Lezcano --- drivers/thermal/armada_thermal.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c index c2ebfb5..52d63b3 100644 --- a/drivers/thermal/armada_thermal.c +++ b/drivers/thermal/armada_thermal.c @@ -420,9 +420,9 @@ static struct thermal_zone_device_ops legacy_ops = { .get_temp = armada_get_temp_legacy, }; -static int armada_get_temp(void *_sensor, int *temp) +static int armada_get_temp(struct thermal_zone_device *tz, int *temp) { - struct armada_thermal_sensor *sensor = _sensor; + struct armada_thermal_sensor *sensor = tz->devdata; struct armada_thermal_priv *priv = sensor->priv; int ret; @@ -450,7 +450,7 @@ unlock_mutex: return ret; } -static const struct thermal_zone_of_device_ops of_ops = { +static const struct thermal_zone_device_ops of_ops = { .get_temp = armada_get_temp, }; @@ -928,9 +928,9 @@ static int armada_thermal_probe(struct platform_device *pdev) /* Register the sensor */ sensor->priv = priv; sensor->id = sensor_id; - tz = devm_thermal_zone_of_sensor_register(&pdev->dev, - sensor->id, sensor, - &of_ops); + tz = devm_thermal_of_zone_register(&pdev->dev, + sensor->id, sensor, + &of_ops); if (IS_ERR(tz)) { dev_info(&pdev->dev, "Thermal sensor %d unavailable\n", sensor_id);