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=-14.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=unavailable 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 C7960C43461 for ; Thu, 17 Sep 2020 17:57:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 71FCC208E4 for ; Thu, 17 Sep 2020 17:57:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600365466; bh=JPsTCcKQSJWwioUgZClYmjeaDcco+sofmS5Hjg0G3ek=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=azQUSFQSDPnziGctf0o1FyLbsyCsKXVv2RXlwYTdo8SkLCpPmjoZVKYM8Lzs4gHPl OiVaDxtrYNQ091jMJEz/UZlizd0GFC/13MATRsnV3JqrtTgX2wGVCFb3fnYdW/fLhP ZZT7GBI2cDELPUysmc4hmKjNw9KMLjljsYSWYlYY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726502AbgIQR5T (ORCPT ); Thu, 17 Sep 2020 13:57:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:46998 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726582AbgIQR4F (ORCPT ); Thu, 17 Sep 2020 13:56:05 -0400 Received: from archlinux (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B8F8A20707; Thu, 17 Sep 2020 17:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600365364; bh=JPsTCcKQSJWwioUgZClYmjeaDcco+sofmS5Hjg0G3ek=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=k5ag4xwb9mY1gMrrsG6c8EQLFPZ/cX/gXYPDYWqZbG8xFOrK7iAWLAbu7jffpeIj7 qFl6zqMq8hBlU355hSDh67wO+0ZmiTpgXYQvvrtjMc5wom6ya0PpeGFlxoSOLV68vk +BhWrpgM3aCOuxrq1diqfXfgQrn+DpkSwKIEG0ig= Date: Thu, 17 Sep 2020 18:55:59 +0100 From: Jonathan Cameron To: Alexandru Ardelean Cc: Alexandru Ardelean , linux-iio , LKML Subject: Re: [PATCH] iio: buffer: split buffer sysfs creation to take buffer as primary arg Message-ID: <20200917185559.7d6971e3@archlinux> In-Reply-To: References: <20200917125951.861-1-alexandru.ardelean@analog.com> <20200917181626.59eb84c8@archlinux> X-Mailer: Claws Mail 3.17.6 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 17 Sep 2020 20:41:08 +0300 Alexandru Ardelean wrote: > On Thu, Sep 17, 2020 at 8:18 PM Jonathan Cameron wrote: > > > > On Thu, 17 Sep 2020 15:59:51 +0300 > > Alexandru Ardelean wrote: > > > > > Currently the iio_buffer_{alloc,free}_sysfs_and_mask() take 'indio_dev' as > > > primary argument. This change splits the main logic into a private function > > > that takes an IIO buffer as primary argument. > > > > > > That way, the functions can be extended to configure the sysfs for multiple > > > buffers. > > > > > > Signed-off-by: Alexandru Ardelean > > > > One comment inline. Whilst I think it is safe as you have it, I'd > > rather avoid the minor change in logic if we don't need to make it. > > > > Thanks, > > > > Jonathan Applied to the togreg branch of iio.git. See below for my pathetic Diff confused me excuse :) Jonathan > > > > > > > --- > > > drivers/iio/industrialio-buffer.c | 46 ++++++++++++++++++++----------- > > > 1 file changed, 30 insertions(+), 16 deletions(-) > > > > > > diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c > > > index a7d7e5143ed2..a4f6bb96d4f4 100644 > > > --- a/drivers/iio/industrialio-buffer.c > > > +++ b/drivers/iio/industrialio-buffer.c > > > @@ -1264,26 +1264,14 @@ static struct attribute *iio_buffer_attrs[] = { > > > &dev_attr_data_available.attr, > > > }; > > > > > > -int iio_buffer_alloc_sysfs_and_mask(struct iio_dev *indio_dev) > > > +static int __iio_buffer_alloc_sysfs_and_mask(struct iio_buffer *buffer, > > > + struct iio_dev *indio_dev) > > > { > > > struct iio_dev_attr *p; > > > struct attribute **attr; > > > - struct iio_buffer *buffer = indio_dev->buffer; > > > int ret, i, attrn, attrcount; > > > const struct iio_chan_spec *channels; > > > > > > - channels = indio_dev->channels; > > > - if (channels) { > > > - int ml = indio_dev->masklength; > > > - > > > - for (i = 0; i < indio_dev->num_channels; i++) > > > - ml = max(ml, channels[i].scan_index + 1); > > > - indio_dev->masklength = ml; > > > - } > > > - > > > - if (!buffer) > > > - return 0; > > > - > > > attrcount = 0; > > > if (buffer->attrs) { > > > while (buffer->attrs[attrcount] != NULL) > > > @@ -1367,19 +1355,45 @@ int iio_buffer_alloc_sysfs_and_mask(struct iio_dev *indio_dev) > > > return ret; > > > } > > > > > > -void iio_buffer_free_sysfs_and_mask(struct iio_dev *indio_dev) > > > +int iio_buffer_alloc_sysfs_and_mask(struct iio_dev *indio_dev) > > > { > > > struct iio_buffer *buffer = indio_dev->buffer; > > > + const struct iio_chan_spec *channels; > > > + int i; > > > + > > > + channels = indio_dev->channels; > > > + if (channels) { > > > + int ml = indio_dev->masklength; > > > + > > > + for (i = 0; i < indio_dev->num_channels; i++) > > > + ml = max(ml, channels[i].scan_index + 1); > > > + indio_dev->masklength = ml; > > > + } > > > > I've not really figured out if it matters, but this is a logic change. > > Previously we didn't compute masklength if there was no buffer provided. > > Now we do. It's probably better to move the if (!buffer) check above > > this block or at least mention this change in the patch description. > > > > Umm, are you referring that this patch is a logic change or you are > suggesting a logic change? > The "if (!buffer)" check was positioned after the masklength > computation even in the old code. > Got you. Diff confused me :) > > > > > > > > if (!buffer) > > > - return; > > > + return 0; > > > + > > > + return __iio_buffer_alloc_sysfs_and_mask(buffer, indio_dev); > > > +} > > > > > > +static void __iio_buffer_free_sysfs_and_mask(struct iio_buffer *buffer) > > > +{ > > > bitmap_free(buffer->scan_mask); > > > kfree(buffer->buffer_group.attrs); > > > kfree(buffer->scan_el_group.attrs); > > > iio_free_chan_devattr_list(&buffer->scan_el_dev_attr_list); > > > } > > > > > > +void iio_buffer_free_sysfs_and_mask(struct iio_dev *indio_dev) > > > +{ > > > + struct iio_buffer *buffer = indio_dev->buffer; > > > + > > > + if (!buffer) > > > + return; > > > + > > > + __iio_buffer_free_sysfs_and_mask(buffer); > > > +} > > > + > > > /** > > > * iio_validate_scan_mask_onehot() - Validates that exactly one channel is selected > > > * @indio_dev: the iio device > >