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=-12.8 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=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 279EBC4363D for ; Fri, 25 Sep 2020 12:13:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ACD1A221EC for ; Fri, 25 Sep 2020 12:13:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601036004; bh=Fmb6jRRPhkAIzexZPvNOSf5Dq7LTK2PkF2Id+8yDxNo=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=NpyByODottNRaCWutJxyrbACAKBitPpsAZogSb1oKrevXj5Umr4jl9chS4GS2T7bP Nm6euKSi3/xUuwhHiBDiitw3qwBHOuBC4E95XcW6kDOlu9lTtUBBA0ZhVbTrWRCcKE 1lsRgbGDp8+b4CwvfYtgsibmrb0D+OcwFjRFKz7I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727044AbgIYMNY (ORCPT ); Fri, 25 Sep 2020 08:13:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:34174 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726368AbgIYMNX (ORCPT ); Fri, 25 Sep 2020 08:13:23 -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 419DA2083B; Fri, 25 Sep 2020 12:13:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601036002; bh=Fmb6jRRPhkAIzexZPvNOSf5Dq7LTK2PkF2Id+8yDxNo=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=JVSX/JTxC2E8CzOyUzD4uXbgWa3KmN8vtVCqwdctr71fTMO2HCoUgWi0fxOBXDSeB VQM0q/xHVFfx7U3PjqCzTWnAMsuuNDI7e932l2p4Ipni2pmgOuBdrJDSM/LXccIT2d WvgH3OGI4JWWeaKLB8FwtzzkrXwKU9q3x75hkS38= Date: Fri, 25 Sep 2020 13:13:18 +0100 From: Jonathan Cameron To: Cristian Pop Cc: , Subject: Re: [PATCH v6 1/4] iio: core: Add optional symbolic label to a device channel Message-ID: <20200925131318.7eabcae7@archlinux> In-Reply-To: <20200921133020.62978-1-cristian.pop@analog.com> References: <20200921133020.62978-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-iio@vger.kernel.org On Mon, 21 Sep 2020 16:30:17 +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 Hi Cristian, Looks good to me as does patch 3. Just the docs and DT to tidy up now. Thanks, Jonathan > --- > Changes in V6: > - Fix indentation > - Check for "read_label callback" inside "iio_device_add_channel_label" > > drivers/iio/industrialio-core.c | 40 +++++++++++++++++++++++++++++++++ > include/linux/iio/iio.h | 6 +++++ > 2 files changed, 46 insertions(+) > > diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c > index 6e388293c828..b577fff35641 100644 > --- a/drivers/iio/industrialio-core.c > +++ b/drivers/iio/industrialio-core.c > @@ -669,6 +669,19 @@ 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 -EINVAL; > + > + return indio_dev->info->read_label(indio_dev, this_attr->c, buf); > +} > + > static ssize_t iio_read_channel_info(struct device *dev, > struct device_attribute *attr, > char *buf) > @@ -1137,6 +1150,28 @@ 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; > + > + if (!indio_dev->info->read_label) > + return 0; > + > + 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, > @@ -1270,6 +1305,11 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev, > return ret; > attrcount += ret; > > + 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 2e45b3ceafa7..9a3cf4815148 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);