From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: edubezval@gmail.com, rui.zhang@intel.com
Cc: linux-pm@vger.kernel.org, leo.yan@linaro.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 10/18] thermal/drivers/hisi: Rename and remove unused field
Date: Thu, 19 Oct 2017 19:05:52 +0200 [thread overview]
Message-ID: <1508432760-17847-10-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1508432760-17847-1-git-send-email-daniel.lezcano@linaro.org>
Rename the 'sensors' field to 'sensor' as we describe only one sensor.
Remove the 'sensor_temp' as it is no longer used.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Leo Yan <leo.yan@linaro.org>
Tested-by: Leo Yan <leo.yan@linaro.org>
---
drivers/thermal/hisi_thermal.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index c7bdcfe..baa3853 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -49,8 +49,6 @@
struct hisi_thermal_sensor {
struct hisi_thermal_data *thermal;
struct thermal_zone_device *tzd;
-
- long sensor_temp;
uint32_t id;
uint32_t thres_temp;
};
@@ -59,9 +57,9 @@ struct hisi_thermal_data {
struct mutex thermal_lock; /* protects register data */
struct platform_device *pdev;
struct clk *clk;
- struct hisi_thermal_sensor sensors;
- int irq;
+ struct hisi_thermal_sensor sensor;
void __iomem *regs;
+ int irq;
};
/*
@@ -233,7 +231,7 @@ static struct thermal_zone_of_device_ops hisi_of_thermal_ops = {
static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev)
{
struct hisi_thermal_data *data = dev;
- struct hisi_thermal_sensor *sensor = &data->sensors;
+ struct hisi_thermal_sensor *sensor = &data->sensor;
int temp;
hisi_thermal_alarm_clear(data->regs, 1);
@@ -244,7 +242,7 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev)
dev_crit(&data->pdev->dev, "THERMAL ALARM: %d > %d\n",
temp, sensor->thres_temp);
- thermal_zone_device_update(data->sensors.tzd,
+ thermal_zone_device_update(data->sensor.tzd,
THERMAL_EVENT_UNSPECIFIED);
} else if (temp < sensor->thres_temp) {
@@ -307,7 +305,7 @@ static int hisi_thermal_setup(struct hisi_thermal_data *data)
{
struct hisi_thermal_sensor *sensor;
- sensor = &data->sensors;
+ sensor = &data->sensor;
/* disable module firstly */
hisi_thermal_reset_enable(data->regs, 0);
@@ -380,7 +378,7 @@ static int hisi_thermal_probe(struct platform_device *pdev)
}
ret = hisi_thermal_register_sensor(pdev, data,
- &data->sensors,
+ &data->sensor,
HISI_DEFAULT_SENSOR);
if (ret) {
dev_err(&pdev->dev, "failed to register thermal sensor: %d\n",
@@ -402,7 +400,7 @@ static int hisi_thermal_probe(struct platform_device *pdev)
return ret;
}
- hisi_thermal_toggle_sensor(&data->sensors, true);
+ hisi_thermal_toggle_sensor(&data->sensor, true);
return 0;
}
@@ -410,7 +408,7 @@ static int hisi_thermal_probe(struct platform_device *pdev)
static int hisi_thermal_remove(struct platform_device *pdev)
{
struct hisi_thermal_data *data = platform_get_drvdata(pdev);
- struct hisi_thermal_sensor *sensor = &data->sensors;
+ struct hisi_thermal_sensor *sensor = &data->sensor;
hisi_thermal_toggle_sensor(sensor, false);
hisi_thermal_disable_sensor(data);
--
2.7.4
next prev parent reply other threads:[~2017-10-19 17:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-19 17:05 [GIT PULL] thermal: new material for hikey for 4.15 #2 Daniel Lezcano
2017-10-19 17:05 ` [PATCH 01/18] thermal/drivers/hisi: Fix missing interrupt enablement Daniel Lezcano
2017-10-19 17:05 ` [PATCH 02/18] thermal/drivers/hisi: Remove the multiple sensors support Daniel Lezcano
2017-10-19 17:05 ` [PATCH 03/18] thermal/drivers/hisi: Fix kernel panic on alarm interrupt Daniel Lezcano
2017-10-19 17:05 ` [PATCH 04/18] thermal/drivers/hisi: Simplify the temperature/step computation Daniel Lezcano
2017-10-19 17:05 ` [PATCH 05/18] thermal/drivers/hisi: Fix multiple alarm interrupts firing Daniel Lezcano
2017-10-19 17:05 ` [PATCH 06/18] thermal/drivers/hisi: Remove pointless lock Daniel Lezcano
2017-10-19 17:05 ` [PATCH 07/18] thermal/drivers/hisi: Encapsulate register writes into helpers Daniel Lezcano
2017-10-19 17:05 ` [PATCH 08/18] thermal/drivers/hisi: Fix configuration register setting Daniel Lezcano
2017-10-19 17:05 ` [PATCH 09/18] thermal/drivers/hisi: Remove costly sensor inspection Daniel Lezcano
2017-10-19 17:05 ` Daniel Lezcano [this message]
2017-10-19 17:05 ` [PATCH 11/18] thermal/drivers/hisi: Convert long to int Daniel Lezcano
2017-10-19 17:05 ` [PATCH 12/18] thermal/drivers/hisi: Remove thermal data back pointer Daniel Lezcano
2017-10-19 17:05 ` [PATCH 13/18] thermal/drivers/hisi: Remove mutex_lock in the code Daniel Lezcano
2017-10-19 17:05 ` [PATCH 14/18] thermal/drivers/hisi: Move the clk setup in the corresponding functions Daniel Lezcano
2017-10-19 17:05 ` [PATCH 15/18] thermal/drivers/hisi: Use round up step value Daniel Lezcano
2017-10-19 17:05 ` [PATCH 16/18] thermal/drivers/step_wise: Fix temperature regulation misbehavior Daniel Lezcano
2017-10-19 17:05 ` [PATCH 17/18] thermal/drivers/generic-iio-adc: Switch tz request to devm version Daniel Lezcano
2017-10-19 17:06 ` [PATCH 18/18] thermal/drivers/qcom-spmi: Use devm_iio_channel_get Daniel Lezcano
2017-10-20 1:52 ` [PATCH 01/18] thermal/drivers/hisi: Fix missing interrupt enablement Eduardo Valentin
2017-10-20 6:35 ` 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=1508432760-17847-10-git-send-email-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=edubezval@gmail.com \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.