From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: daniel.lezcano@linaro.org, rafael@kernel.org
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
rui.zhang@intel.com, "Raju Rangoju" <rajur@chelsio.com>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Peter Kaestle" <peter@piie.net>,
"Hans de Goede" <hdegoede@redhat.com>,
"Mark Gross" <markgross@kernel.org>,
"Miquel Raynal" <miquel.raynal@bootlin.com>,
"Amit Kucheria" <amitk@kernel.org>,
"Nicolas Saenz Julienne" <nsaenz@kernel.org>,
"Broadcom Kernel Team" <bcm-kernel-feedback-list@broadcom.com>,
"Florian Fainelli" <f.fainelli@gmail.com>,
"Ray Jui" <rjui@broadcom.com>,
"Scott Branden" <sbranden@broadcom.com>,
"Support Opensource" <support.opensource@diasemi.com>,
"Lukasz Luba" <lukasz.luba@arm.com>,
"Shawn Guo" <shawnguo@kernel.org>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Pengutronix Kernel Team" <kernel@pengutronix.de>,
"Fabio Estevam" <festevam@gmail.com>,
"NXP Linux Team" <linux-imx@nxp.com>,
"Thara Gopinath" <thara.gopinath@linaro.org>,
"Andy Gross" <agross@kernel.org>,
"Bjorn Andersson" <bjorn.andersson@linaro.org>,
"Niklas Söderlund" <niklas.soderlund@ragnatech.se>,
"Bartlomiej Zolnierkiewicz" <bzolnier@gmail.com>,
"Krzysztof Kozlowski" <krzysztof.kozlowski@linaro.org>,
"Alim Akhtar" <alim.akhtar@samsung.com>,
"Thierry Reding" <thierry.reding@gmail.com>,
"Jonathan Hunter" <jonathanh@nvidia.com>,
"Eduardo Valentin" <edubezval@gmail.com>,
Keerthy <j-keerthy@ti.com>,
"Kunihiko Hayashi" <hayashi.kunihiko@socionext.com>,
"Masami Hiramatsu" <mhiramat@kernel.org>,
"Antoine Tenart" <atenart@kernel.org>,
"Srinivas Pandruvada" <srinivas.pandruvada@linux.intel.com>,
"Dmitry Osipenko" <digetx@gmail.com>,
netdev@vger.kernel.org, platform-driver-x86@vger.kernel.org,
linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-arm-msm@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
linux-samsung-soc@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-omap@vger.kernel.org
Subject: [PATCH v7 27/29] thermal/drivers/cxgb4: Use generic thermal_zone_get_trip() function
Date: Wed, 28 Sep 2022 23:00:57 +0200 [thread overview]
Message-ID: <20220928210059.891387-28-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <20220928210059.891387-1-daniel.lezcano@linaro.org>
The thermal framework gives the possibility to register the trip
points with the thermal zone. When that is done, no get_trip_* ops are
needed and they can be removed.
Convert ops content logic into generic trip points and register them with the
thermal zone.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Jakub Kicinski <kuba@kernel.org>
---
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 -
.../ethernet/chelsio/cxgb4/cxgb4_thermal.c | 41 ++++---------------
2 files changed, 8 insertions(+), 35 deletions(-)
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index 5657ac8cfca0..fca9533bc011 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -1079,8 +1079,6 @@ struct mbox_list {
#if IS_ENABLED(CONFIG_THERMAL)
struct ch_thermal {
struct thermal_zone_device *tzdev;
- int trip_temp;
- int trip_type;
};
#endif
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c
index 9a6d65243334..1d49cfe3e2ab 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c
@@ -29,36 +29,12 @@ static int cxgb4_thermal_get_temp(struct thermal_zone_device *tzdev,
return 0;
}
-static int cxgb4_thermal_get_trip_type(struct thermal_zone_device *tzdev,
- int trip, enum thermal_trip_type *type)
-{
- struct adapter *adap = tzdev->devdata;
-
- if (!adap->ch_thermal.trip_temp)
- return -EINVAL;
-
- *type = adap->ch_thermal.trip_type;
- return 0;
-}
-
-static int cxgb4_thermal_get_trip_temp(struct thermal_zone_device *tzdev,
- int trip, int *temp)
-{
- struct adapter *adap = tzdev->devdata;
-
- if (!adap->ch_thermal.trip_temp)
- return -EINVAL;
-
- *temp = adap->ch_thermal.trip_temp;
- return 0;
-}
-
static struct thermal_zone_device_ops cxgb4_thermal_ops = {
.get_temp = cxgb4_thermal_get_temp,
- .get_trip_type = cxgb4_thermal_get_trip_type,
- .get_trip_temp = cxgb4_thermal_get_trip_temp,
};
+static struct thermal_trip trip = { .type = THERMAL_TRIP_CRITICAL } ;
+
int cxgb4_thermal_init(struct adapter *adap)
{
struct ch_thermal *ch_thermal = &adap->ch_thermal;
@@ -79,15 +55,14 @@ int cxgb4_thermal_init(struct adapter *adap)
if (ret < 0) {
num_trip = 0; /* could not get trip temperature */
} else {
- ch_thermal->trip_temp = val * 1000;
- ch_thermal->trip_type = THERMAL_TRIP_CRITICAL;
+ trip.temperature = val * 1000;
}
-
+
snprintf(ch_tz_name, sizeof(ch_tz_name), "cxgb4_%s", adap->name);
- ch_thermal->tzdev = thermal_zone_device_register(ch_tz_name, num_trip,
- 0, adap,
- &cxgb4_thermal_ops,
- NULL, 0, 0);
+ ch_thermal->tzdev = thermal_zone_device_register_with_trips(ch_tz_name, &trip, num_trip,
+ 0, adap,
+ &cxgb4_thermal_ops,
+ NULL, 0, 0);
if (IS_ERR(ch_thermal->tzdev)) {
ret = PTR_ERR(ch_thermal->tzdev);
dev_err(adap->pdev_dev, "Failed to register thermal zone\n");
--
2.34.1
next prev parent reply other threads:[~2022-09-28 21:07 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-28 21:00 [PATCH v7 00/29] Rework the trip points creation Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 01/29] thermal/core: Add a generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-30 17:20 ` Rafael J. Wysocki
2022-09-28 21:00 ` [PATCH v7 02/29] thermal/sysfs: Always expose hysteresis attributes Daniel Lezcano
2022-09-30 17:23 ` Rafael J. Wysocki
2022-09-28 21:00 ` [PATCH v7 03/29] thermal/core: Add a generic thermal_zone_set_trip() function Daniel Lezcano
2022-09-30 17:27 ` Rafael J. Wysocki
2022-09-28 21:00 ` [PATCH v7 04/29] thermal/core/governors: Use thermal_zone_get_trip() instead of ops functions Daniel Lezcano
2022-09-30 17:31 ` Rafael J. Wysocki
2022-09-28 21:00 ` [PATCH v7 05/29] thermal/of: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 06/29] thermal/of: Remove unused functions Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 07/29] thermal/drivers/exynos: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 08/29] thermal/drivers/exynos: of_thermal_get_ntrips() Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 09/29] thermal/drivers/exynos: Replace of_thermal_is_trip_valid() by thermal_zone_get_trip() Daniel Lezcano
2022-09-29 7:31 ` Krzysztof Kozlowski
2022-09-28 21:00 ` [PATCH v7 10/29] thermal/drivers/tegra: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 11/29] thermal/drivers/uniphier: " Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 12/29] thermal/drivers/hisi: " Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 13/29] thermal/drivers/qcom: " Daniel Lezcano
2022-09-29 13:31 ` Dmitry Baryshkov
2022-09-28 21:00 ` [PATCH v7 14/29] thermal/drivers/armada: " Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 15/29] thermal/drivers/rcar_gen3: Use the generic function to get the number of trips Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 16/29] thermal/of: Remove of_thermal_get_ntrips() Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 17/29] thermal/of: Remove of_thermal_is_trip_valid() Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 18/29] thermal/of: Remove of_thermal_set_trip_hyst() Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 19/29] thermal/of: Remove of_thermal_get_crit_temp() Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 20/29] thermal/drivers/st: Use generic trip points Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 21/29] thermal/drivers/imx: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 22/29] thermal/drivers/rcar: " Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 23/29] thermal/drivers/broadcom: " Daniel Lezcano
2022-09-29 17:34 ` Florian Fainelli
2022-09-28 21:00 ` [PATCH v7 24/29] thermal/drivers/da9062: " Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 25/29] thermal/drivers/ti: Remove unused macros ti_thermal_get_trip_value() / ti_thermal_trip_is_valid() Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 26/29] thermal/drivers/acerhdf: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-28 21:00 ` Daniel Lezcano [this message]
2022-09-28 21:00 ` [PATCH v7 28/29] thermal/intel/int340x: Replace parameter to simplify Daniel Lezcano
2022-09-28 21:00 ` [PATCH v7 29/29] thermal/drivers/intel: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-29 12:25 ` [PATCH v7 00/29] Rework the trip points creation Daniel Lezcano
2022-09-29 13:58 ` Rafael J. Wysocki
2022-09-29 14:57 ` Daniel Lezcano
2022-09-29 19:35 ` Rafael J. Wysocki
2022-09-30 17:39 ` Rafael J. Wysocki
2022-10-03 7:32 ` Lukasz Luba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220928210059.891387-28-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=agross@kernel.org \
--cc=alim.akhtar@samsung.com \
--cc=amitk@kernel.org \
--cc=atenart@kernel.org \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=bjorn.andersson@linaro.org \
--cc=bzolnier@gmail.com \
--cc=davem@davemloft.net \
--cc=digetx@gmail.com \
--cc=edubezval@gmail.com \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=festevam@gmail.com \
--cc=hayashi.kunihiko@socionext.com \
--cc=hdegoede@redhat.com \
--cc=j-keerthy@ti.com \
--cc=jonathanh@nvidia.com \
--cc=kernel@pengutronix.de \
--cc=krzysztof.kozlowski@linaro.org \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=lukasz.luba@arm.com \
--cc=markgross@kernel.org \
--cc=mhiramat@kernel.org \
--cc=miquel.raynal@bootlin.com \
--cc=netdev@vger.kernel.org \
--cc=niklas.soderlund@ragnatech.se \
--cc=nsaenz@kernel.org \
--cc=pabeni@redhat.com \
--cc=peter@piie.net \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=rajur@chelsio.com \
--cc=rjui@broadcom.com \
--cc=rui.zhang@intel.com \
--cc=s.hauer@pengutronix.de \
--cc=sbranden@broadcom.com \
--cc=shawnguo@kernel.org \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=support.opensource@diasemi.com \
--cc=thara.gopinath@linaro.org \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).