From patchwork Wed Dec 12 01:49:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 10725491 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 939FE3E9D for ; Wed, 12 Dec 2018 01:49:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8551A2A0CE for ; Wed, 12 Dec 2018 01:49:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79D432A0FD; Wed, 12 Dec 2018 01:49:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 162E92A0CE for ; Wed, 12 Dec 2018 01:49:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726296AbeLLBtz (ORCPT ); Tue, 11 Dec 2018 20:49:55 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:39236 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726285AbeLLBtz (ORCPT ); Tue, 11 Dec 2018 20:49:55 -0500 Received: by mail-wm1-f65.google.com with SMTP id f81so4201030wmd.4; Tue, 11 Dec 2018 17:49:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sZSxFpQkw2E4qWQFOzkloCvXbAyVW6y0ebILJ0r+z8g=; b=aCTgncSbxjqmZTz8wLUFBbD5dP9ZPZ426O0C9V4RM9R1kLEqhvXC5Xk6o1EEvUFg8i GbGoGHHyCck0vLPRZle65do36AwAGwo9hGHldCWOdeV3pgXL6iD7LTdP66oB1Mp9o6Tw VVlyWT8Qk6IUVvJW79vtfpRiOBwx+k8cUNO8CB8Pgqqp9EKqQS/dH5X7t1YTdo0FKKiR bfLtweAxbzQEoMVfIoHCB4WnJgBPelJ3j1FYAiUaDpICtaabixIzpKXrffbA69s5N8XH pw2gkUvypWOORZyXwvGKY7iI1RHD2TO1yjXTGDicIJN4fCvOJM32N4CxAWnyPqSkGDEK 3zLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sZSxFpQkw2E4qWQFOzkloCvXbAyVW6y0ebILJ0r+z8g=; b=N+4/cw5hptd9Ar/iw6d7etJcCGOZ59MPZWnaiAYq5HLw/7keRD5xIboIT/Gl8BThbt pfbEmuKHTBMXoXR8pil9W1tNWU9djU1bkf4T8JhaG3CbKYIFliB8ivWBmStO6ia1q/E4 cxzw+F8qpLD+OwXqVAtDVpzCin/ELvD0mNm7RyKBOhFF2z4AY/9rSnMjlOt9hswTpMNk dWUkWA7tpWsuhnCRS+t+Wg2PMnfIZoAnaox3Q48Gb+ZMt4aZApEW6KPtepeLJkx8Oo6G JpE+3RzCkGtWkHdMRjNvnCHHv8x3nj+EC8PtAy+DkWGFCX/IWKJ7QnjRUVEAb1oxRsgm dz0Q== X-Gm-Message-State: AA+aEWZci+B71hWb2Akc13IJmsXx4GTaz2iTZyMpbRlwMv+rSJnEmjTh 7m0lUUYKTXWEtSQxmY8i6xgEknIt X-Google-Smtp-Source: AFSGD/WYH7os2LmN6Q8NnJ9ECACav5knS/feiAzpE6/hEc7oNYDGo60ote6i6t58Uebh2l9qO9AcJg== X-Received: by 2002:a1c:934e:: with SMTP id v75mr4486894wmd.126.1544579393038; Tue, 11 Dec 2018 17:49:53 -0800 (PST) Received: from kurokawa.lan (ip-86-49-110-70.net.upcbroadband.cz. [86.49.110.70]) by smtp.gmail.com with ESMTPSA id v8sm12887250wrq.53.2018.12.11.17.49.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 17:49:52 -0800 (PST) From: Marek Vasut X-Google-Original-From: Marek Vasut To: linux-pm@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, Marek Vasut , Alexandre Torgue , Daniel Lezcano , David HERNANDEZ SANCHEZ , Eduardo Valentin , Maxime Coquelin , Wolfram Sang , Zhang Rui , linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH 4/6] thermal: stm32: Convert to devm_thermal_zone_of_sensor_register_params() Date: Wed, 12 Dec 2018 02:49:25 +0100 Message-Id: <20181212014927.25840-5-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181212014927.25840-1-marek.vasut+renesas@gmail.com> References: <20181212014927.25840-1-marek.vasut+renesas@gmail.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Convert the stm32 code to devm_thermal_zone_of_sensor_register_params(), no functional change. Signed-off-by: Marek Vasut Cc: Alexandre Torgue Cc: Daniel Lezcano Cc: David HERNANDEZ SANCHEZ Cc: Eduardo Valentin Cc: Maxime Coquelin Cc: Wolfram Sang Cc: Zhang Rui Cc: linux-renesas-soc@vger.kernel.org Cc: linux-stm32@st-md-mailman.stormreply.com To: linux-pm@vger.kernel.org --- drivers/thermal/st/stm_thermal.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/thermal/st/stm_thermal.c b/drivers/thermal/st/stm_thermal.c index 47623da0f91b..ee0915dfe96a 100644 --- a/drivers/thermal/st/stm_thermal.c +++ b/drivers/thermal/st/stm_thermal.c @@ -20,7 +20,6 @@ #include #include "../thermal_core.h" -#include "../thermal_hwmon.h" /* DTS register offsets */ #define DTS_CFGR1_OFFSET 0x0 @@ -103,6 +102,10 @@ struct stm_thermal_sensor { int t0, fmt0, ramp_coeff; }; +static struct thermal_zone_params stm_tz_ops = { + .no_hwmon = false, +}; + static irqreturn_t stm_thermal_alarm_irq(int irq, void *sdata) { struct stm_thermal_sensor *sensor = sdata; @@ -652,9 +655,8 @@ static int stm_thermal_probe(struct platform_device *pdev) if (ret) return ret; - sensor->th_dev = devm_thermal_zone_of_sensor_register(&pdev->dev, 0, - sensor, - &stm_tz_ops); + sensor->th_dev = devm_thermal_zone_of_sensor_register_params(&pdev->dev, + 0, sensor, &stm_tz_ops, &stm_tz_ops); if (IS_ERR(sensor->th_dev)) { dev_err(&pdev->dev, "%s: thermal zone sensor registering KO\n", @@ -711,15 +713,6 @@ static int stm_thermal_probe(struct platform_device *pdev) goto err_tz; } - /* - * Thermal_zone doesn't enable hwmon as default, - * enable it here - */ - sensor->th_dev->tzp->no_hwmon = false; - ret = thermal_add_hwmon_sysfs(sensor->th_dev); - if (ret) - goto err_tz; - sensor->mode = THERMAL_DEVICE_ENABLED; dev_info(&pdev->dev, "%s: Driver initialized successfully\n", @@ -737,7 +730,6 @@ static int stm_thermal_remove(struct platform_device *pdev) struct stm_thermal_sensor *sensor = platform_get_drvdata(pdev); stm_thermal_sensor_off(sensor); - thermal_remove_hwmon_sysfs(sensor->th_dev); thermal_zone_of_sensor_unregister(&pdev->dev, sensor->th_dev); return 0;