On Wed, Mar 09, 2016 at 01:35:27PM -0800, Eduardo Valentin wrote: > 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 <[email protected]> > Cc: Maxime Ripard <[email protected]> > Cc: Chen-Yu Tsai <[email protected]> > Cc: Hans de Goede <[email protected]> > Cc: Zhang Rui <[email protected]> > Cc: Lukasz Majewski <[email protected]> > Cc: Heiko Stuebner <[email protected]> > Cc: Sascha Hauer <[email protected]> > Cc: Jens Thiele <[email protected]> > Cc: [email protected] > Cc: [email protected] > Cc: [email protected] > Signed-off-by: Eduardo Valentin <[email protected]>
Acked-by: Dmitry Torokhov <[email protected]> I guess it will make sense to merge through your tree unless you want to hold off until after I merge winth mainline (around -rc3) assuming that it even makes into 4.6. Thanks. > --- > drivers/input/touchscreen/sun4i-ts.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/drivers/input/touchscreen/sun4i-ts.c > b/drivers/input/touchscreen/sun4i-ts.c > index 4857943..d07dd29 100644 > --- a/drivers/input/touchscreen/sun4i-ts.c > +++ b/drivers/input/touchscreen/sun4i-ts.c > @@ -115,7 +115,6 @@ > struct sun4i_ts_data { > struct device *dev; > struct input_dev *input; > - struct thermal_zone_device *tz; > void __iomem *base; > unsigned int irq; > bool ignore_fifo_data; > @@ -366,10 +365,7 @@ static int sun4i_ts_probe(struct platform_device *pdev) > if (IS_ERR(hwmon)) > return PTR_ERR(hwmon); > > - ts->tz = thermal_zone_of_sensor_register(ts->dev, 0, ts, > - &sun4i_ts_tz_ops); > - if (IS_ERR(ts->tz)) > - ts->tz = NULL; > + devm_thermal_zone_of_sensor_register(ts->dev, 0, ts, &sun4i_ts_tz_ops); > > writel(TEMP_IRQ_EN(1), ts->base + TP_INT_FIFOC); > > @@ -377,7 +373,6 @@ static int sun4i_ts_probe(struct platform_device *pdev) > error = input_register_device(ts->input); > if (error) { > writel(0, ts->base + TP_INT_FIFOC); > - thermal_zone_of_sensor_unregister(ts->dev, ts->tz); > return error; > } > } > @@ -394,8 +389,6 @@ static int sun4i_ts_remove(struct platform_device *pdev) > if (ts->input) > input_unregister_device(ts->input); > > - thermal_zone_of_sensor_unregister(ts->dev, ts->tz); > - > /* Deactivate all IRQs */ > writel(0, ts->base + TP_INT_FIFOC); > > -- > 2.1.4 > -- Dmitry
