From: Daniel Lezcano <daniel.lezcano@linexp.org>
To: daniel.lezcano@linaro.org, rafael@kernel.org
Cc: rui.zhang@intel.com, khilman@baylibre.com, abailon@baylibre.com,
amitk@kernel.org, linux-kernel@vger.kernel.org,
linux-pm@vger.kernel.org, Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Thara Gopinath <thara.gopinath@gmail.com>,
linux-arm-msm@vger.kernel.org (open list:ARM/QUALCOMM SUPPORT)
Subject: [PATCH v1 11/33] thermal/drivers/qcom: Switch to new of API
Date: Sun, 10 Jul 2022 23:24:01 +0200 [thread overview]
Message-ID: <20220710212423.681301-12-daniel.lezcano@linexp.org> (raw)
In-Reply-To: <20220710212423.681301-1-daniel.lezcano@linexp.org>
The thermal OF code has a new API allowing to migrate the OF
initialization to a simpler approach.
Use this new API.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linexp.org>
---
drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 19 +++++++++----------
drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 12 ++++++------
drivers/thermal/qcom/tsens.c | 20 ++++++++++----------
3 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/drivers/thermal/qcom/qcom-spmi-adc-tm5.c b/drivers/thermal/qcom/qcom-spmi-adc-tm5.c
index d9c9c975f931..dccbb66e5cd2 100644
--- a/drivers/thermal/qcom/qcom-spmi-adc-tm5.c
+++ b/drivers/thermal/qcom/qcom-spmi-adc-tm5.c
@@ -355,9 +355,9 @@ static irqreturn_t adc_tm5_gen2_isr(int irq, void *data)
return IRQ_HANDLED;
}
-static int adc_tm5_get_temp(void *data, int *temp)
+static int adc_tm5_get_temp(struct thermal_zone_device *tz, int *temp)
{
- struct adc_tm5_channel *channel = data;
+ struct adc_tm5_channel *channel = tz->devdata;
int ret;
if (!channel || !channel->iio)
@@ -637,9 +637,9 @@ static int adc_tm5_gen2_configure(struct adc_tm5_channel *channel, int low, int
return ret;
}
-static int adc_tm5_set_trips(void *data, int low, int high)
+static int adc_tm5_set_trips(struct thermal_zone_device *tz, int low, int high)
{
- struct adc_tm5_channel *channel = data;
+ struct adc_tm5_channel *channel = tz->devdata;
struct adc_tm5_chip *chip;
int ret;
@@ -658,7 +658,7 @@ static int adc_tm5_set_trips(void *data, int low, int high)
return ret;
}
-static struct thermal_zone_of_device_ops adc_tm5_thermal_ops = {
+static struct thermal_zone_device_ops adc_tm5_thermal_ops = {
.get_temp = adc_tm5_get_temp,
.set_trips = adc_tm5_set_trips,
};
@@ -670,11 +670,10 @@ static int adc_tm5_register_tzd(struct adc_tm5_chip *adc_tm)
for (i = 0; i < adc_tm->nchannels; i++) {
adc_tm->channels[i].chip = adc_tm;
-
- tzd = devm_thermal_zone_of_sensor_register(adc_tm->dev,
- adc_tm->channels[i].channel,
- &adc_tm->channels[i],
- &adc_tm5_thermal_ops);
+ tzd = devm_thermal_of_zone_register(adc_tm->dev,
+ adc_tm->channels[i].channel,
+ &adc_tm->channels[i],
+ &adc_tm5_thermal_ops);
if (IS_ERR(tzd)) {
if (PTR_ERR(tzd) == -ENODEV) {
dev_warn(adc_tm->dev, "thermal sensor on channel %d is not used\n",
diff --git a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c
index 7419e196dbb0..cb1d382e833f 100644
--- a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c
+++ b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c
@@ -185,9 +185,9 @@ static int qpnp_tm_update_temp_no_adc(struct qpnp_tm_chip *chip)
return 0;
}
-static int qpnp_tm_get_temp(void *data, int *temp)
+static int qpnp_tm_get_temp(struct thermal_zone_device *tz, int *temp)
{
- struct qpnp_tm_chip *chip = data;
+ struct qpnp_tm_chip *chip = tz->devdata;
int ret, mili_celsius;
if (!temp)
@@ -262,9 +262,9 @@ static int qpnp_tm_update_critical_trip_temp(struct qpnp_tm_chip *chip,
return qpnp_tm_write(chip, QPNP_TM_REG_SHUTDOWN_CTRL1, reg);
}
-static int qpnp_tm_set_trip_temp(void *data, int trip, int temp)
+static int qpnp_tm_set_trip_temp(struct thermal_zone_device *tz, int trip, int temp)
{
- struct qpnp_tm_chip *chip = data;
+ struct qpnp_tm_chip *chip = tz->devdata;
const struct thermal_trip *trip_points;
int ret;
@@ -282,7 +282,7 @@ static int qpnp_tm_set_trip_temp(void *data, int trip, int temp)
return ret;
}
-static const struct thermal_zone_of_device_ops qpnp_tm_sensor_ops = {
+static struct thermal_zone_device_ops qpnp_tm_sensor_ops = {
.get_temp = qpnp_tm_get_temp,
.set_trip_temp = qpnp_tm_set_trip_temp,
};
@@ -445,7 +445,7 @@ static int qpnp_tm_probe(struct platform_device *pdev)
* read the trip points. get_temp() returns the default temperature
* before the hardware initialization is completed.
*/
- chip->tz_dev = devm_thermal_zone_of_sensor_register(
+ chip->tz_dev = devm_thermal_of_zone_register(
&pdev->dev, 0, chip, &qpnp_tm_sensor_ops);
if (IS_ERR(chip->tz_dev)) {
dev_err(&pdev->dev, "failed to register sensor\n");
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index 7963ee33bf75..f59ad42d94e6 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -532,9 +532,9 @@ static irqreturn_t tsens_irq_thread(int irq, void *data)
return IRQ_HANDLED;
}
-static int tsens_set_trips(void *_sensor, int low, int high)
+static int tsens_set_trips(struct thermal_zone_device *tz, int low, int high)
{
- struct tsens_sensor *s = _sensor;
+ struct tsens_sensor *s = tz->devdata;
struct tsens_priv *priv = s->priv;
struct device *dev = priv->dev;
struct tsens_irq_data d;
@@ -925,17 +925,17 @@ int __init init_common(struct tsens_priv *priv)
return ret;
}
-static int tsens_get_temp(void *data, int *temp)
+static int tsens_get_temp(struct thermal_zone_device *tz, int *temp)
{
- struct tsens_sensor *s = data;
+ struct tsens_sensor *s = tz->devdata;
struct tsens_priv *priv = s->priv;
return priv->ops->get_temp(s, temp);
}
-static int tsens_get_trend(void *data, int trip, enum thermal_trend *trend)
+static int tsens_get_trend(struct thermal_zone_device *tz, int trip, enum thermal_trend *trend)
{
- struct tsens_sensor *s = data;
+ struct tsens_sensor *s = tz->devdata;
struct tsens_priv *priv = s->priv;
if (priv->ops->get_trend)
@@ -1002,7 +1002,7 @@ static const struct of_device_id tsens_table[] = {
};
MODULE_DEVICE_TABLE(of, tsens_table);
-static const struct thermal_zone_of_device_ops tsens_of_ops = {
+static struct thermal_zone_device_ops tsens_of_ops = {
.get_temp = tsens_get_temp,
.get_trend = tsens_get_trend,
.set_trips = tsens_set_trips,
@@ -1056,9 +1056,9 @@ static int tsens_register(struct tsens_priv *priv)
for (i = 0; i < priv->num_sensors; i++) {
priv->sensor[i].priv = priv;
- tzd = devm_thermal_zone_of_sensor_register(priv->dev, priv->sensor[i].hw_id,
- &priv->sensor[i],
- &tsens_of_ops);
+ tzd = devm_thermal_of_zone_register(priv->dev, priv->sensor[i].hw_id,
+ &priv->sensor[i],
+ &tsens_of_ops);
if (IS_ERR(tzd))
continue;
priv->sensor[i].tzd = tzd;
--
2.25.1
next prev parent reply other threads:[~2022-07-10 21:25 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-10 21:23 [PATCH v1 00/33] New thermal OF code Daniel Lezcano
2022-07-10 21:23 ` [PATCH v1 01/33] thermal/of: Rework the thermal device tree initialization Daniel Lezcano
2022-07-12 2:40 ` Guenter Roeck
2022-07-10 21:23 ` [PATCH v1 02/33] thermal/of: Make new code and old code co-exist Daniel Lezcano
2022-07-10 21:23 ` [PATCH v1 03/33] thermal/drivers/rockchip: Switch to new of API Daniel Lezcano
2022-07-10 21:23 ` [PATCH v1 04/33] thermal/drivers/uniphier: " Daniel Lezcano
2022-07-10 21:23 ` [PATCH v1 05/33] thermal/drivers/generic-adc: " Daniel Lezcano
2022-07-10 21:23 ` [PATCH v1 06/33] thermal/drivers/mmio: " Daniel Lezcano
2022-07-10 21:23 ` [PATCH v1 07/33] thermal/drivers/tegra: " Daniel Lezcano
2022-07-10 21:23 ` [PATCH v1 08/33] thermal/drivers/sun8i: " Daniel Lezcano
2022-07-10 21:23 ` [PATCH v1 09/33] thermal/drivers/sprd: " Daniel Lezcano
2022-07-10 21:24 ` [PATCH v1 10/33] thermal/drivers/broadcom: " Daniel Lezcano
2022-07-11 2:37 ` Florian Fainelli
2022-07-10 21:24 ` Daniel Lezcano [this message]
2022-07-10 21:24 ` [PATCH v1 12/33] thermal/drivers/st: " Daniel Lezcano
2022-07-10 21:24 ` [PATCH v1 13/33] thermal/drivers/amlogic: " Daniel Lezcano
2022-07-10 21:24 ` [PATCH v1 14/33] thermal/drivers/armada: " Daniel Lezcano
2022-07-10 21:24 ` [PATCH v1 15/33] thermal/drivers/db8500: " Daniel Lezcano
2022-07-10 21:24 ` [PATCH v1 16/33] thermal/drivers/imx: " Daniel Lezcano
2022-07-10 21:24 ` [PATCH v1 17/33] thermal/drivers/rcar: " Daniel Lezcano
2022-07-19 9:10 ` Niklas Söderlund
2022-07-22 19:34 ` Daniel Lezcano
2022-07-24 18:27 ` Daniel Lezcano
2022-07-24 19:00 ` Niklas Söderlund
2022-07-24 21:11 ` Daniel Lezcano
2022-07-24 22:39 ` Niklas Söderlund
2022-07-24 23:28 ` Niklas Söderlund
2022-07-25 10:00 ` Daniel Lezcano
2022-07-25 10:38 ` Niklas Söderlund
2022-07-25 21:09 ` Daniel Lezcano
2022-07-10 21:24 ` [PATCH v1 18/33] thermal/drivers/rzg2l: " Daniel Lezcano
2022-07-10 21:24 ` [PATCH v1 19/33] thermal/drivers/qoriq: " Daniel Lezcano
2022-07-10 21:24 ` [PATCH v1 20/33] thermal/drivers/mtk: " Daniel Lezcano
2022-07-10 21:24 ` [PATCH v1 21/33] thermal/drivers/banggap: " Daniel Lezcano
2022-07-10 21:24 ` [PATCH v1 22/33] thermal/drivers/maxim: " Daniel Lezcano
2022-07-10 21:24 ` [PATCH v1 23/33] thermal/drivers/hisilicon: " Daniel Lezcano
2022-07-10 21:24 ` [PATCH v1 24/33] thermal/drivers/ti-soc: " Daniel Lezcano
2022-07-10 21:24 ` [PATCH v1 25/33] ata/drivers/ahci_imx: Switch to new of thermal API Daniel Lezcano
2022-07-10 23:18 ` Damien Le Moal
2022-07-11 9:14 ` Daniel Lezcano
2022-07-11 10:37 ` Damien Le Moal
2022-07-10 21:24 ` [PATCH v1 26/33] hwmon/drivers: " Daniel Lezcano
2022-07-13 13:43 ` Guenter Roeck
2022-07-10 21:24 ` [PATCH v1 27/33] iio/drivers/sun4i_gpadc: " Daniel Lezcano
2022-07-11 7:52 ` Lars-Peter Clausen
2022-07-10 21:24 ` [PATCH v1 28/33] input/drivers/touchscreen_sun4i: " Daniel Lezcano
2022-07-11 3:28 ` Dmitry Torokhov
2022-07-10 21:24 ` [PATCH v1 29/33] regulator/drivers/max8976: " Daniel Lezcano
2022-07-11 11:02 ` Mark Brown
2022-07-10 21:24 ` [PATCH v1 30/33] thermal/drivers/bcm2835: " Daniel Lezcano
2022-07-11 2:40 ` Florian Fainelli
2022-07-10 21:24 ` [PATCH v1 31/33] thermal/drivers/samsung: " Daniel Lezcano
2022-07-11 10:41 ` Krzysztof Kozlowski
2022-07-10 21:24 ` [PATCH v1 32/33] thermal/core: Move set_trip_temp ops to the sysfs code Daniel Lezcano
2022-07-10 21:24 ` [PATCH v1 33/33] thermal/of: Remove old OF code Daniel Lezcano
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=20220710212423.681301-12-daniel.lezcano@linexp.org \
--to=daniel.lezcano@linexp.org \
--cc=abailon@baylibre.com \
--cc=agross@kernel.org \
--cc=amitk@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=daniel.lezcano@linaro.org \
--cc=khilman@baylibre.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=rui.zhang@intel.com \
--cc=thara.gopinath@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).