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,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 1D0DFC43464 for ; Sat, 19 Sep 2020 15:21:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D5C312098B for ; Sat, 19 Sep 2020 15:21:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600528873; bh=UqATmfScUDqjCfvGJ9AlWKlwwQzzv5nUke/nidgEsu8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=IDTwB6WmQCVM8c7yO17ZOX9olGuigHJlWS4dCtQHZzmgA1qC3HBXQu0wHPqPw1qCu aCt8Nq28JJ0Qan+wAXCXwj+c/03+Ns+UhImioUOZrqKsG646U5NKC25NQpmlNsa0Yz daxoNC0hfYsAikPuaGqRJMaj/KRdKoMuFvTSqPak= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726610AbgISPVN (ORCPT ); Sat, 19 Sep 2020 11:21:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:34944 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726438AbgISPVM (ORCPT ); Sat, 19 Sep 2020 11:21:12 -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 607F82098B; Sat, 19 Sep 2020 15:21:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600528871; bh=UqATmfScUDqjCfvGJ9AlWKlwwQzzv5nUke/nidgEsu8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=N+oh8D6FLtlklXOim619wRBvEroaAI0Dj9ycPNCrGvUVGxyVSWQxCvkIAToiHkgTX AZJROJ3JKS0leb0jTB0viCok66lf6xSJ16G1n/BY4A3mbiHPwQ+/QUEfL0VlJQI8Ap +ezsvnlf+W5SDxks55aRHgWi23J1nPhavNGTRy3Q= Date: Sat, 19 Sep 2020 16:21:08 +0100 From: Jonathan Cameron To: Cristian Pop Cc: , Subject: Re: [PATCH v5] iio: core: Add optional symbolic label to a device channel Message-ID: <20200919162108.7baa1058@archlinux> In-Reply-To: <20200918093302.93527-1-cristian.pop@analog.com> References: <20200918093302.93527-1-cristian.pop@analog.com> 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 Fri, 18 Sep 2020 12:33:02 +0300 Cristian Pop wrote: > If a label is defined in the device tree for this channel add that > to the channel specific attributes. This is useful for userspace to > be able to identify an individual channel. > > Signed-off-by: Cristian Pop > --- > Changes in V5: > Create patch for single commits. Patch is fine, but should be in a series with the other two rather than one patch per commit? > drivers/iio/industrialio-core.c | 41 +++++++++++++++++++++++++++++++++ > include/linux/iio/iio.h | 6 +++++ > 2 files changed, 47 insertions(+) > > diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c > index 1527f01a44f1..49868e080840 100644 > --- a/drivers/iio/industrialio-core.c > +++ b/drivers/iio/industrialio-core.c > @@ -643,6 +643,21 @@ ssize_t iio_format_value(char *buf, unsigned int type, int size, int *vals) > } > EXPORT_SYMBOL_GPL(iio_format_value); > > +static ssize_t iio_read_channel_label(struct device *dev, > + struct device_attribute *attr, > + char *buf) > +{ > + struct iio_dev *indio_dev = dev_to_iio_dev(dev); > + struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); > + > + if (indio_dev->info->read_label) > + return indio_dev->info->read_label(indio_dev, > + this_attr->c, > + buf); > + else > + return -EINVAL; > +} > + > static ssize_t iio_read_channel_info(struct device *dev, > struct device_attribute *attr, > char *buf) > @@ -1111,6 +1126,25 @@ int __iio_add_chan_devattr(const char *postfix, > return ret; > } > > +static int iio_device_add_channel_label(struct iio_dev *indio_dev, > + struct iio_chan_spec const *chan) > +{ > + int ret; > + > + ret = __iio_add_chan_devattr("label", > + chan, > + &iio_read_channel_label, > + NULL, > + 0, > + IIO_SEPARATE, > + &indio_dev->dev, > + &indio_dev->channel_attr_list); > + if (ret < 0) > + return ret; > + > + return 1; > +} > + > static int iio_device_add_info_mask_type(struct iio_dev *indio_dev, > struct iio_chan_spec const *chan, > enum iio_shared_by shared_by, > @@ -1241,6 +1275,13 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev, > return ret; > attrcount += ret; > > + if (indio_dev->info->read_label) { > + ret = iio_device_add_channel_label(indio_dev, chan); > + if (ret < 0) > + return ret; > + attrcount += ret; > + } > + > if (chan->ext_info) { > unsigned int i = 0; > for (ext_info = chan->ext_info; ext_info->name; ext_info++) { > diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h > index a1be82e74c93..58b151f5321d 100644 > --- a/include/linux/iio/iio.h > +++ b/include/linux/iio/iio.h > @@ -362,6 +362,8 @@ struct iio_trigger; /* forward declaration */ > * and max. For lists, all possible values are enumerated. > * @write_raw: function to write a value to the device. > * Parameters are the same as for read_raw. > + * @read_label: function to request label name for a specified label, > + * for better channel identification. > * @write_raw_get_fmt: callback function to query the expected > * format/precision. If not set by the driver, write_raw > * returns IIO_VAL_INT_PLUS_MICRO. > @@ -420,6 +422,10 @@ struct iio_info { > int val2, > long mask); > > + int (*read_label)(struct iio_dev *indio_dev, > + struct iio_chan_spec const *chan, > + char *label); > + > int (*write_raw_get_fmt)(struct iio_dev *indio_dev, > struct iio_chan_spec const *chan, > long mask);