From: Jonathan Cameron <jic23@kernel.org>
To: Alexandru Ardelean <alexandru.ardelean@analog.com>
Cc: <linux-iio@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<lars@metafoo.de>
Subject: Re: [RFC PATCH 04/12] iio: buffer: add index to the first IIO buffer dir and symlink it back
Date: Sat, 21 Nov 2020 18:27:47 +0000 [thread overview]
Message-ID: <20201121182747.28b8d576@archlinux> (raw)
In-Reply-To: <20201117162340.43924-5-alexandru.ardelean@analog.com>
On Tue, 17 Nov 2020 18:23:32 +0200
Alexandru Ardelean <alexandru.ardelean@analog.com> wrote:
> This change makes it so that the first buffer directory is named 'buffer0'
> and moves the 'scan_elements' under it.
>
> For backwards compatibility these folders are symlinked back to the
> original folders.
Well done on your patch breakdown here. Makes the actual switch nice
and simple in this patch.
Looks good to me.
Thanks,
Jonathan
>
> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
> ---
> drivers/iio/industrialio-buffer.c | 38 +++++++++++++++++++++++++++----
> 1 file changed, 33 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
> index 8b31faf049a5..62c8bd6b67cd 100644
> --- a/drivers/iio/industrialio-buffer.c
> +++ b/drivers/iio/industrialio-buffer.c
> @@ -1346,7 +1346,8 @@ static void iio_sysfs_del_attrs(struct kobject *kobj, struct attribute **ptr)
> }
>
> static int __iio_buffer_alloc_sysfs_and_mask(struct iio_buffer *buffer,
> - struct iio_dev *indio_dev)
> + struct iio_dev *indio_dev,
> + unsigned int idx)
> {
> struct iio_dev_attr *p;
> struct attribute **attr;
> @@ -1378,7 +1379,7 @@ static int __iio_buffer_alloc_sysfs_and_mask(struct iio_buffer *buffer,
> buffer->buffer_attrs = attr;
>
> ret = kobject_init_and_add(&buffer->buffer_dir, &iio_buffer_dir_ktype,
> - &indio_dev->dev.kobj, "buffer");
> + &indio_dev->dev.kobj, "buffer%u", idx);
> if (ret)
> goto error_buffer_free_attrs;
>
> @@ -1423,7 +1424,7 @@ static int __iio_buffer_alloc_sysfs_and_mask(struct iio_buffer *buffer,
> }
>
> ret = kobject_init_and_add(&buffer->scan_el_dir, &iio_scan_el_dir_ktype,
> - &indio_dev->dev.kobj, "scan_elements");
> + &buffer->buffer_dir, "scan_elements");
> if (ret)
> goto error_free_scan_attrs;
>
> @@ -1454,11 +1455,13 @@ static int __iio_buffer_alloc_sysfs_and_mask(struct iio_buffer *buffer,
> return ret;
> }
>
> +static void __iio_buffer_free_sysfs_and_mask(struct iio_buffer *buffer);
> +
> 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;
> + int i, ret;
>
> channels = indio_dev->channels;
> if (channels) {
> @@ -1472,7 +1475,29 @@ int iio_buffer_alloc_sysfs_and_mask(struct iio_dev *indio_dev)
> if (!buffer)
> return 0;
>
> - return __iio_buffer_alloc_sysfs_and_mask(buffer, indio_dev);
> + ret = __iio_buffer_alloc_sysfs_and_mask(buffer, indio_dev, 0);
> + if (ret)
> + return ret;
> +
> + ret = sysfs_create_link(&indio_dev->dev.kobj,
> + &indio_dev->buffer->buffer_dir,
> + "buffer");
> + if (ret)
> + goto error_free_sysfs_and_mask;
> +
> + ret = sysfs_create_link(&indio_dev->dev.kobj,
> + &indio_dev->buffer->scan_el_dir,
> + "scan_elements");
> + if (ret)
> + goto error_remove_buffer_dir_link;
> +
> + return 0;
> +
> +error_remove_buffer_dir_link:
> + sysfs_remove_link(&indio_dev->dev.kobj, "buffer");
> +error_free_sysfs_and_mask:
> + __iio_buffer_free_sysfs_and_mask(buffer);
> + return ret;
> }
>
> static void __iio_buffer_free_sysfs_and_mask(struct iio_buffer *buffer)
> @@ -1494,6 +1519,9 @@ void iio_buffer_free_sysfs_and_mask(struct iio_dev *indio_dev)
> if (!buffer)
> return;
>
> + sysfs_remove_link(&indio_dev->dev.kobj, "scan_elements");
> + sysfs_remove_link(&indio_dev->dev.kobj, "buffer");
> +
> __iio_buffer_free_sysfs_and_mask(buffer);
> }
>
next prev parent reply other threads:[~2020-11-21 18:27 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-17 16:23 [RFC PATCH 00/12] iio: core,buffer: add support for multiple IIO buffers per IIO device Alexandru Ardelean
2020-11-17 16:23 ` [RFC PATCH 01/12] iio: core: register chardev only if needed Alexandru Ardelean
2020-11-21 18:02 ` Jonathan Cameron
2020-11-23 12:10 ` Alexandru Ardelean
2020-11-17 16:23 ` [RFC PATCH 02/12] iio: buffer: add back-ref from iio_buffer to iio_dev Alexandru Ardelean
2020-11-17 16:23 ` [RFC PATCH 03/12] iio: buffer: rework buffer & scan_elements dir creation Alexandru Ardelean
2020-11-21 18:24 ` Jonathan Cameron
2020-11-23 12:21 ` Alexandru Ardelean
2020-11-17 16:23 ` [RFC PATCH 04/12] iio: buffer: add index to the first IIO buffer dir and symlink it back Alexandru Ardelean
2020-11-21 18:27 ` Jonathan Cameron [this message]
2020-11-17 16:23 ` [RFC PATCH 05/12] iio: core: split __iio_device_attr_init() to init only the attr object Alexandru Ardelean
2020-11-17 16:23 ` [RFC PATCH 06/12] iio: buffer: re-route scan_elements via it's kobj_type Alexandru Ardelean
2020-11-21 18:33 ` Jonathan Cameron
2020-11-23 12:22 ` Alexandru Ardelean
2020-11-17 16:23 ` [RFC PATCH 07/12] iio: buffer: re-route core buffer attributes via it's new kobj_type Alexandru Ardelean
2020-11-17 16:23 ` [RFC PATCH 08/12] iio: buffer: add helper to get the IIO device to which a buffer belongs Alexandru Ardelean
2020-11-17 16:23 ` [RFC PATCH 09/12] iio: re-route all buffer attributes through new buffer kobj_type Alexandru Ardelean
2020-11-17 16:23 ` [RFC PATCH 10/12] iio: core: wrap iio device & buffer into struct for character devices Alexandru Ardelean
2020-11-17 16:23 ` [RFC PATCH 11/12] iio: buffer: introduce support for attaching more IIO buffers Alexandru Ardelean
2020-11-21 18:44 ` Jonathan Cameron
2020-11-23 12:27 ` Alexandru Ardelean
2020-11-17 16:23 ` [RFC PATCH 12/12] iio: buffer: add ioctl() to support opening extra buffers for IIO device Alexandru Ardelean
2020-11-21 18:50 ` Jonathan Cameron
2020-11-23 12:54 ` Alexandru Ardelean
2020-11-21 18:52 ` [RFC PATCH 00/12] iio: core,buffer: add support for multiple IIO buffers per " Jonathan Cameron
2020-11-23 13:03 ` Alexandru Ardelean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201121182747.28b8d576@archlinux \
--to=jic23@kernel.org \
--cc=alexandru.ardelean@analog.com \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).