From patchwork Tue Aug 23 12:43:00 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: 599650 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 597AAC32789 for ; Tue, 23 Aug 2022 16:22:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244492AbiHWQWi (ORCPT ); Tue, 23 Aug 2022 12:22:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244398AbiHWQWK (ORCPT ); Tue, 23 Aug 2022 12:22:10 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1AD8C9DF8E for ; Tue, 23 Aug 2022 05:43:03 -0700 (PDT) Date: Tue, 23 Aug 2022 12:43:00 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1661258581; 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=OiyyrbShmBw+IHpQiRmx5b1NlzQUEIy2NQP7GuHR5U8=; b=2gRTYkFHy5g7F9aN4IzW50TmOOEaKpxTkXiJgKPRZ7ppnq0wCYaTVwKRg2Wh08oTLUnUK3 87K4xcxlQ8gKHrYISFVy0j4jcdyeaNNuq5TEKJAOmdGEzN09l+tHQVHvPltHTbz5g/MG78 8th4V+nysmI6/+S7muhE7kbhVkM7YYb+t8nG7wTQTMIXA0eVRW5BHWKW20TpPRuIWY6zAy uHCW+gMHMn2Qrqsgoh8Fdca2ylWBzIEK7WOuO3sjmzg6guBBm3vrxmKppiNCGRh71PU4VK +fCi//z+851Go9tBtnKL3b6+Y2yUCbEeyE7U7XsecYMLuaANxN6RKDxm4rG1iw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1661258581; 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=OiyyrbShmBw+IHpQiRmx5b1NlzQUEIy2NQP7GuHR5U8=; b=vz5jkDV/0aAw605NG8kSjXhKHQ+7ZkT+HKCLz+sgoAWf1xt0n7bY6Z7KgJZNnYNJLRkKnM XfoYQG/lskAU/EBA== 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/qoriq: Switch to new of API Cc: Daniel Lezcano , Daniel Lezcano , rui.zhang@intel.com, amitk@kernel.org In-Reply-To: <20220804224349.1926752-20-daniel.lezcano@linexp.org> References: <20220804224349.1926752-20-daniel.lezcano@linexp.org> MIME-Version: 1.0 Message-ID: <166125858057.401.4503062938284781631.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: 3e7494b41c41959cd68a3f652e286c1fb7c626fc Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//3e7494b41c41959cd68a3f652e286c1fb7c626fc Author: Daniel Lezcano AuthorDate: Fri, 05 Aug 2022 00:43:35 +02:00 Committer: Daniel Lezcano CommitterDate: Wed, 17 Aug 2022 14:09:38 +02:00 thermal/drivers/qoriq: 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-20-daniel.lezcano@linexp.org Signed-off-by: Daniel Lezcano --- drivers/thermal/qoriq_thermal.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c index 73049f9..d111e21 100644 --- a/drivers/thermal/qoriq_thermal.c +++ b/drivers/thermal/qoriq_thermal.c @@ -82,9 +82,9 @@ static struct qoriq_tmu_data *qoriq_sensor_to_data(struct qoriq_sensor *s) return container_of(s, struct qoriq_tmu_data, sensor[s->id]); } -static int tmu_get_temp(void *p, int *temp) +static int tmu_get_temp(struct thermal_zone_device *tz, int *temp) { - struct qoriq_sensor *qsensor = p; + struct qoriq_sensor *qsensor = tz->devdata; struct qoriq_tmu_data *qdata = qoriq_sensor_to_data(qsensor); u32 val; /* @@ -122,7 +122,7 @@ static int tmu_get_temp(void *p, int *temp) return 0; } -static const struct thermal_zone_of_device_ops tmu_tz_ops = { +static const struct thermal_zone_device_ops tmu_tz_ops = { .get_temp = tmu_get_temp, }; @@ -146,9 +146,9 @@ static int qoriq_tmu_register_tmu_zone(struct device *dev, sensor->id = id; - tzd = devm_thermal_zone_of_sensor_register(dev, id, - sensor, - &tmu_tz_ops); + tzd = devm_thermal_of_zone_register(dev, id, + sensor, + &tmu_tz_ops); ret = PTR_ERR_OR_ZERO(tzd); if (ret) { if (ret == -ENODEV)