Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933119AbcCIVpW (ORCPT ); Wed, 9 Mar 2016 16:45:22 -0500 Received: from mail-pf0-f169.google.com ([209.85.192.169]:34147 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750819AbcCIVpS (ORCPT ); Wed, 9 Mar 2016 16:45:18 -0500 Date: Wed, 9 Mar 2016 13:45:14 -0800 From: Dmitry Torokhov To: Eduardo Valentin Cc: Rui Zhang , Linux PM , LKML , lm-sensors@lm-sensors.org, Maxime Ripard , Chen-Yu Tsai , Hans de Goede , Lukasz Majewski , Heiko Stuebner , Sascha Hauer , Jens Thiele , linux-input@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 05/13] input: convert sun4i-ts to use devm_thermal_zone_of_sensor_register Message-ID: <20160309214514.GA18066@dtor-ws> References: <1457559336-17652-1-git-send-email-edubezval@gmail.com> <1457559336-17652-6-git-send-email-edubezval@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1457559336-17652-6-git-send-email-edubezval@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2524 Lines: 78 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 > Cc: Maxime Ripard > Cc: Chen-Yu Tsai > Cc: Hans de Goede > Cc: Zhang Rui > Cc: Lukasz Majewski > Cc: Heiko Stuebner > Cc: Sascha Hauer > Cc: Jens Thiele > Cc: linux-input@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Eduardo Valentin Acked-by: Dmitry Torokhov 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