From: Jonathan Cameron <jonathan.cameron@huawei.com>
To: Phil Reid <preid@electromag.com.au>
Cc: Jonathan Cameron <jic23@kernel.org>, <knaack.h@gmx.de>,
<lars@metafoo.de>, <pmeerw@pmeerw.net>, <robh+dt@kernel.org>,
<mark.rutland@arm.com>, <linux-iio@vger.kernel.org>,
<devicetree@vger.kernel.org>, <michal.simek@xilinx.com>
Subject: Re: [PATCH v2 2/2] iio: core: Add optional symbolic label to device attributes
Date: Tue, 8 Oct 2019 13:40:01 +0100 [thread overview]
Message-ID: <20191008134001.00005f40@huawei.com> (raw)
In-Reply-To: <34a7ab42-1e07-8c20-11ab-8e2a9dd2e74b@electromag.com.au>
On Tue, 8 Oct 2019 15:06:44 +0800
Phil Reid <preid@electromag.com.au> wrote:
> On 8/10/2019 04:32, Jonathan Cameron wrote:
> > On Sat, 5 Oct 2019 15:59:05 +0100
> > Jonathan Cameron <jic23@kernel.org> wrote:
> >
> >> On Thu, 19 Sep 2019 22:36:08 +0800
> >> Phil Reid <preid@electromag.com.au> wrote:
> >>
> >>> If a label is defined in the device tree for this device add that
> >>> to the device specific attributes. This is useful for userspace to
> >>> be able to identify an individual device when multiple identical
> >>> chips are present in the system.
> >>>
> >>> Tested-by: Michal Simek <michal.simek@xilinx.com>
> >>> Signed-off-by: Phil Reid <preid@electromag.com.au>
> >>
> >> Glad to see this going in given I thought I'd already applied it
> >> and told someone they should be using it early today (oops ;)
> >>
> >> Applied to the togreg branch of iio.git and pushed out as testing
> >> for the autobuilders to play with it.
> >
> > 0-day picked up that there were no docs for this new field.
> > I've added some and re pushed out.
>
> Thanks.
> Just for my info what should I be doing to check for that.
> Don't remember getting any warnings for that.
./scripts/kernel-doc htmldocs
or similar
https://www.kernel.org/doc/Documentation/kernel-doc-nano-HOWTO.txt
includes how to test individual files.
Thanks,
Jonathan
>
>
> >
> > Thanks,
> >
> > Jonathan
> >
> >>
> >> Thanks for doing this.
> >>
> >> Jonathan
> >>
> >>> ---
> >>> drivers/iio/industrialio-core.c | 17 +++++++++++++++++
> >>> include/linux/iio/iio.h | 1 +
> >>> 2 files changed, 18 insertions(+)
> >>>
> >>> diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
> >>> index 524a686077ca..f72c2dc5f703 100644
> >>> --- a/drivers/iio/industrialio-core.c
> >>> +++ b/drivers/iio/industrialio-core.c
> >>> @@ -1238,6 +1238,16 @@ static ssize_t iio_show_dev_name(struct device *dev,
> >>>
> >>> static DEVICE_ATTR(name, S_IRUGO, iio_show_dev_name, NULL);
> >>>
> >>> +static ssize_t iio_show_dev_label(struct device *dev,
> >>> + struct device_attribute *attr,
> >>> + char *buf)
> >>> +{
> >>> + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> >>> + return snprintf(buf, PAGE_SIZE, "%s\n", indio_dev->label);
> >>> +}
> >>> +
> >>> +static DEVICE_ATTR(label, S_IRUGO, iio_show_dev_label, NULL);
> >>> +
> >>> static ssize_t iio_show_timestamp_clock(struct device *dev,
> >>> struct device_attribute *attr,
> >>> char *buf)
> >>> @@ -1354,6 +1364,8 @@ static int iio_device_register_sysfs(struct iio_dev *indio_dev)
> >>>
> >>> if (indio_dev->name)
> >>> attrcount++;
> >>> + if (indio_dev->label)
> >>> + attrcount++;
> >>> if (clk)
> >>> attrcount++;
> >>>
> >>> @@ -1376,6 +1388,8 @@ static int iio_device_register_sysfs(struct iio_dev *indio_dev)
> >>> indio_dev->chan_attr_group.attrs[attrn++] = &p->dev_attr.attr;
> >>> if (indio_dev->name)
> >>> indio_dev->chan_attr_group.attrs[attrn++] = &dev_attr_name.attr;
> >>> + if (indio_dev->label)
> >>> + indio_dev->chan_attr_group.attrs[attrn++] = &dev_attr_label.attr;
> >>> if (clk)
> >>> indio_dev->chan_attr_group.attrs[attrn++] = clk;
> >>>
> >>> @@ -1647,6 +1661,9 @@ int __iio_device_register(struct iio_dev *indio_dev, struct module *this_mod)
> >>> if (!indio_dev->dev.of_node && indio_dev->dev.parent)
> >>> indio_dev->dev.of_node = indio_dev->dev.parent->of_node;
> >>>
> >>> + indio_dev->label = of_get_property(indio_dev->dev.of_node, "label",
> >>> + NULL);
> >>> +
> >>> ret = iio_check_unique_scan_index(indio_dev);
> >>> if (ret < 0)
> >>> return ret;
> >>> diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
> >>> index 8e132cf819e4..a2527c7ab934 100644
> >>> --- a/include/linux/iio/iio.h
> >>> +++ b/include/linux/iio/iio.h
> >>> @@ -553,6 +553,7 @@ struct iio_dev {
> >>> struct list_head channel_attr_list;
> >>> struct attribute_group chan_attr_group;
> >>> const char *name;
> >>> + const char *label;
> >>> const struct iio_info *info;
> >>> clockid_t clock_id;
> >>> struct mutex info_exist_lock;
> >>
> >
> >
> >
>
>
prev parent reply other threads:[~2019-10-08 12:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-19 14:36 [PATCH v2 0/2] iio: core: Add optional symbolic label to device attributes Phil Reid
2019-09-19 14:36 ` [PATCH v2 1/2] dt-binding: iio: Add optional label property Phil Reid
2019-09-27 14:44 ` Rob Herring
2019-10-05 14:58 ` Jonathan Cameron
2019-09-19 14:36 ` [PATCH v2 2/2] iio: core: Add optional symbolic label to device attributes Phil Reid
2019-10-05 14:59 ` Jonathan Cameron
2019-10-07 20:32 ` Jonathan Cameron
2019-10-08 7:06 ` Phil Reid
2019-10-08 12:40 ` Jonathan Cameron [this message]
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=20191008134001.00005f40@huawei.com \
--to=jonathan.cameron@huawei.com \
--cc=devicetree@vger.kernel.org \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=michal.simek@xilinx.com \
--cc=pmeerw@pmeerw.net \
--cc=preid@electromag.com.au \
--cc=robh+dt@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).