From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B0B3C28CC5 for ; Sat, 8 Jun 2019 14:09:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E7DA21537 for ; Sat, 8 Jun 2019 14:09:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726989AbfFHOJs (ORCPT ); Sat, 8 Jun 2019 10:09:48 -0400 Received: from saturn.retrosnub.co.uk ([46.235.226.198]:33222 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726227AbfFHOJr (ORCPT ); Sat, 8 Jun 2019 10:09:47 -0400 Received: from archlinux (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) by saturn.retrosnub.co.uk (Postfix; Retrosnub mail submission) with ESMTPSA id 4842B9E7C38; Sat, 8 Jun 2019 15:09:46 +0100 (BST) Date: Sat, 8 Jun 2019 15:09:44 +0100 From: Jonathan Cameron To: Alexandru Ardelean Cc: , Denis Ciocca , Lorenzo Bianconi Subject: Re: [PATCH][V2] iio: st_accel: fix iio_triggered_buffer_{pre,post}enable positions Message-ID: <20190608150944.5764158f@archlinux> In-Reply-To: <20190529135848.11964-1-alexandru.ardelean@analog.com> References: <20190529130121.30532-1-alexandru.ardelean@analog.com> <20190529135848.11964-1-alexandru.ardelean@analog.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On Wed, 29 May 2019 16:58:48 +0300 Alexandru Ardelean wrote: > The iio_triggered_buffer_{predisable,postenable} functions attach/detach > the poll functions. > > For the predisable hook, the disable code should occur before detaching > the poll func, and for the postenable hook, the poll func should be > attached before the enable code. > > Signed-off-by: Alexandru Ardelean I think this is fine, but I'd like an ack from Lorenzo / Denis. Note to those who have missed the background on this, the aim is to both tidy up drivers, but long term to allow for simpler reworking of the core by ensuring consistency of ordering and what is done in each of these hooks. Thanks, Jonathan > --- > Changelog v1 -> v2: > * record the first error in st_accel_buffer_predisable() and return that > > drivers/iio/accel/st_accel_buffer.c | 21 ++++++++++++--------- > 1 file changed, 12 insertions(+), 9 deletions(-) > > diff --git a/drivers/iio/accel/st_accel_buffer.c b/drivers/iio/accel/st_accel_buffer.c > index 7fddc137e91e..711ecd9bc898 100644 > --- a/drivers/iio/accel/st_accel_buffer.c > +++ b/drivers/iio/accel/st_accel_buffer.c > @@ -40,6 +40,10 @@ static int st_accel_buffer_postenable(struct iio_dev *indio_dev) > int err; > struct st_sensor_data *adata = iio_priv(indio_dev); > > + err = iio_triggered_buffer_postenable(indio_dev); > + if (err < 0) > + return err; > + > adata->buffer_data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL); > if (adata->buffer_data == NULL) { > err = -ENOMEM; > @@ -51,34 +55,33 @@ static int st_accel_buffer_postenable(struct iio_dev *indio_dev) > if (err < 0) > goto st_accel_buffer_postenable_error; > > - err = iio_triggered_buffer_postenable(indio_dev); > - if (err < 0) > - goto st_accel_buffer_postenable_error; > - > return err; > > st_accel_buffer_postenable_error: > kfree(adata->buffer_data); > allocate_memory_error: > + iio_triggered_buffer_predisable(indio_dev); > return err; > } > > static int st_accel_buffer_predisable(struct iio_dev *indio_dev) > { > - int err; > + int err, err2; > struct st_sensor_data *adata = iio_priv(indio_dev); > > - err = iio_triggered_buffer_predisable(indio_dev); > - if (err < 0) > - goto st_accel_buffer_predisable_error; > - > err = st_sensors_set_axis_enable(indio_dev, ST_SENSORS_ENABLE_ALL_AXIS); > if (err < 0) > goto st_accel_buffer_predisable_error; > > err = st_sensors_set_enable(indio_dev, false); > + if (err < 0) > + goto st_accel_buffer_predisable_error; > > st_accel_buffer_predisable_error: > + err2 = iio_triggered_buffer_predisable(indio_dev); > + if (!err) > + err = err2; > + > kfree(adata->buffer_data); > return err; > }