From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Cameron Subject: Re: [PATCH V3 2/3] iio: mxs-lradc: remove mxs_lradc_ts_unregister Date: Wed, 4 May 2016 10:39:19 +0100 Message-ID: References: <1461441479-23218-1-git-send-email-stefan.wahren@i2se.com> <1461441479-23218-3-git-send-email-stefan.wahren@i2se.com> <20160425210041.GB26059@dtor-ws> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: Received: from saturn.retrosnub.co.uk ([178.18.118.26]:35796 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752554AbcEDOiB (ORCPT ); Wed, 4 May 2016 10:38:01 -0400 In-Reply-To: <20160425210041.GB26059@dtor-ws> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Dmitry Torokhov , Stefan Wahren Cc: Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Marek Vasut , Ksenija Stanojevic , Fabio Estevam , Juergen Borleis , linux-iio@vger.kernel.org, linux-input@vger.kernel.org, linux-arm-kernel@lists.infradead.org On 25/04/16 22:00, Dmitry Torokhov wrote: > On Sat, Apr 23, 2016 at 07:57:58PM +0000, Stefan Wahren wrote: >> After using devm_input_allocate_device for registration >> the function mxs_lradc_ts_unregister isn't necessary anymore >> since mxs_lradc_ts_close already does the job. >> >> Signed-off-by: Stefan Wahren >> Suggested-by: Dmitry Torokhov > > Acked-by: Dmitry Torokhov Applied. > >> --- >> drivers/iio/adc/mxs-lradc.c | 13 +------------ >> 1 file changed, 1 insertion(+), 12 deletions(-) >> >> diff --git a/drivers/iio/adc/mxs-lradc.c b/drivers/iio/adc/mxs-lradc.c >> index 3d1d370..90242ba 100644 >> --- a/drivers/iio/adc/mxs-lradc.c >> +++ b/drivers/iio/adc/mxs-lradc.c >> @@ -1148,14 +1148,6 @@ static int mxs_lradc_ts_register(struct mxs_lradc *lradc) >> return input_register_device(input); >> } >> >> -static void mxs_lradc_ts_unregister(struct mxs_lradc *lradc) >> -{ >> - if (!lradc->use_touchscreen) >> - return; >> - >> - mxs_lradc_disable_ts(lradc); >> -} >> - >> /* >> * IRQ Handling >> */ >> @@ -1715,13 +1707,11 @@ static int mxs_lradc_probe(struct platform_device *pdev) >> ret = iio_device_register(iio); >> if (ret) { >> dev_err(dev, "Failed to register IIO device\n"); >> - goto err_ts; >> + return ret; >> } >> >> return 0; >> >> -err_ts: >> - mxs_lradc_ts_unregister(lradc); >> err_ts_register: >> mxs_lradc_hw_stop(lradc); >> err_dev: >> @@ -1739,7 +1729,6 @@ static int mxs_lradc_remove(struct platform_device *pdev) >> struct mxs_lradc *lradc = iio_priv(iio); >> >> iio_device_unregister(iio); >> - mxs_lradc_ts_unregister(lradc); >> mxs_lradc_hw_stop(lradc); >> mxs_lradc_trigger_remove(iio); >> iio_triggered_buffer_cleanup(iio); >> -- >> 1.7.9.5 >> >