From patchwork Tue Aug 23 12:43:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thermal-bot for Lad Prabhakar X-Patchwork-Id: 599643 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 D86BEC32789 for ; Tue, 23 Aug 2022 16:22:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244679AbiHWQWt (ORCPT ); Tue, 23 Aug 2022 12:22:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244630AbiHWQW3 (ORCPT ); Tue, 23 Aug 2022 12:22:29 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4763A9F0E8 for ; Tue, 23 Aug 2022 05:43:16 -0700 (PDT) Date: Tue, 23 Aug 2022 12:43:13 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1661258594; 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=UbvFG256uNDjaI7GG4xbVZpPKqCBRmUrSzXcy1wHKAI=; b=NS8+2MJjWHDhgA9KHrJeE8GaoN19UyabbgCComxhkVNpt4r8mr2L49LCI3XYpnFmcaVWm6 3xC/3SVepeYkoTqlbtrgMLAfzBWMRZmBG0t+fIuG2srivI1jh4YqZyQlFQnL06ARDnYXxt W4E8H7NFCJ4LqJfIN2milTv4VG/qQ30U1YtHTOuEexdRZiGBkuNMPTABO3q7YOjVL4jcvB smRIYnSiCTslFCwjj/7a8sbhVtqKhGpCHKMA1PC/soLmQBS2O1D7gEh3DfeXQmWkTExy9f jVnO7Y+GYt3e06nrdmWghhO+7hE1QQIBULCpDKNi9m2ax6sITD6A0r54Cfc21w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1661258594; 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=UbvFG256uNDjaI7GG4xbVZpPKqCBRmUrSzXcy1wHKAI=; b=Oetj1Wl7iMgOYJtH4nBoGEZlbCj+wD3an5NM2aic0SlVP+zoQcA8X/2+L1/77jXoZvtfEP l48INOty9PA03hCg== 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/mmio: Switch to new of API Cc: Daniel Lezcano , Talel Shenhar , Daniel Lezcano , rui.zhang@intel.com, amitk@kernel.org In-Reply-To: <20220804224349.1926752-7-daniel.lezcano@linexp.org> References: <20220804224349.1926752-7-daniel.lezcano@linexp.org> MIME-Version: 1.0 Message-ID: <166125859356.401.5547992458263956674.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: 44b5554d98d422a4411341d9aed5352c2ce34fc1 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//44b5554d98d422a4411341d9aed5352c2ce34fc1 Author: Daniel Lezcano AuthorDate: Fri, 05 Aug 2022 00:43:22 +02:00 Committer: Daniel Lezcano CommitterDate: Wed, 17 Aug 2022 14:09:37 +02:00 thermal/drivers/mmio: 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 Reviewed-by: Talel Shenhar Link: https://lore.kernel.org/r/20220804224349.1926752-7-daniel.lezcano@linexp.org Signed-off-by: Daniel Lezcano --- drivers/thermal/thermal_mmio.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/thermal/thermal_mmio.c b/drivers/thermal/thermal_mmio.c index 360b0df..1bf1a16 100644 --- a/drivers/thermal/thermal_mmio.c +++ b/drivers/thermal/thermal_mmio.c @@ -20,11 +20,10 @@ static u32 thermal_mmio_readb(void __iomem *mmio_base) return readb(mmio_base); } -static int thermal_mmio_get_temperature(void *private, int *temp) +static int thermal_mmio_get_temperature(struct thermal_zone_device *tz, int *temp) { int t; - struct thermal_mmio *sensor = - (struct thermal_mmio *)private; + struct thermal_mmio *sensor = tz->devdata; t = sensor->read_mmio(sensor->mmio_base) & sensor->mask; t *= sensor->factor; @@ -34,7 +33,7 @@ static int thermal_mmio_get_temperature(void *private, int *temp) return 0; } -static const struct thermal_zone_of_device_ops thermal_mmio_ops = { +static const struct thermal_zone_device_ops thermal_mmio_ops = { .get_temp = thermal_mmio_get_temperature, }; @@ -68,10 +67,10 @@ static int thermal_mmio_probe(struct platform_device *pdev) } } - thermal_zone = devm_thermal_zone_of_sensor_register(&pdev->dev, - 0, - sensor, - &thermal_mmio_ops); + thermal_zone = devm_thermal_of_zone_register(&pdev->dev, + 0, + sensor, + &thermal_mmio_ops); if (IS_ERR(thermal_zone)) { dev_err(&pdev->dev, "failed to register sensor (%ld)\n", @@ -79,7 +78,7 @@ static int thermal_mmio_probe(struct platform_device *pdev) return PTR_ERR(thermal_zone); } - thermal_mmio_get_temperature(sensor, &temperature); + thermal_mmio_get_temperature(thermal_zone, &temperature); dev_info(&pdev->dev, "thermal mmio sensor %s registered, current temperature: %d\n", pdev->name, temperature);