Commit e28d0c9c authored by Eduardo Valentin's avatar Eduardo Valentin

input: convert sun4i-ts to use devm_thermal_zone_of_sensor_register

This changes the driver to use the devm_ version
of thermal_zone_of_sensor_register and cleans
up the  local points and unregister calls.

Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Jens Thiele <karme@karme.de>
Cc: linux-input@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent d7817ff2
...@@ -115,7 +115,6 @@ ...@@ -115,7 +115,6 @@
struct sun4i_ts_data { struct sun4i_ts_data {
struct device *dev; struct device *dev;
struct input_dev *input; struct input_dev *input;
struct thermal_zone_device *tz;
void __iomem *base; void __iomem *base;
unsigned int irq; unsigned int irq;
bool ignore_fifo_data; bool ignore_fifo_data;
...@@ -366,10 +365,7 @@ static int sun4i_ts_probe(struct platform_device *pdev) ...@@ -366,10 +365,7 @@ static int sun4i_ts_probe(struct platform_device *pdev)
if (IS_ERR(hwmon)) if (IS_ERR(hwmon))
return PTR_ERR(hwmon); return PTR_ERR(hwmon);
ts->tz = thermal_zone_of_sensor_register(ts->dev, 0, ts, devm_thermal_zone_of_sensor_register(ts->dev, 0, ts, &sun4i_ts_tz_ops);
&sun4i_ts_tz_ops);
if (IS_ERR(ts->tz))
ts->tz = NULL;
writel(TEMP_IRQ_EN(1), ts->base + TP_INT_FIFOC); writel(TEMP_IRQ_EN(1), ts->base + TP_INT_FIFOC);
...@@ -377,7 +373,6 @@ static int sun4i_ts_probe(struct platform_device *pdev) ...@@ -377,7 +373,6 @@ static int sun4i_ts_probe(struct platform_device *pdev)
error = input_register_device(ts->input); error = input_register_device(ts->input);
if (error) { if (error) {
writel(0, ts->base + TP_INT_FIFOC); writel(0, ts->base + TP_INT_FIFOC);
thermal_zone_of_sensor_unregister(ts->dev, ts->tz);
return error; return error;
} }
} }
...@@ -394,8 +389,6 @@ static int sun4i_ts_remove(struct platform_device *pdev) ...@@ -394,8 +389,6 @@ static int sun4i_ts_remove(struct platform_device *pdev)
if (ts->input) if (ts->input)
input_unregister_device(ts->input); input_unregister_device(ts->input);
thermal_zone_of_sensor_unregister(ts->dev, ts->tz);
/* Deactivate all IRQs */ /* Deactivate all IRQs */
writel(0, ts->base + TP_INT_FIFOC); writel(0, ts->base + TP_INT_FIFOC);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment