From patchwork Fri Jan 22 16:25:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 12039943 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 23FABC43381 for ; Fri, 22 Jan 2021 16:23:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DEB462343E for ; Fri, 22 Jan 2021 16:23:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729648AbhAVQXl (ORCPT ); Fri, 22 Jan 2021 11:23:41 -0500 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:47714 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729640AbhAVQX2 (ORCPT ); Fri, 22 Jan 2021 11:23:28 -0500 Received: from pps.filterd (m0167088.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 10MGLofs005882; Fri, 22 Jan 2021 11:22:35 -0500 Received: from nwd2mta3.analog.com ([137.71.173.56]) by mx0a-00128a01.pphosted.com with ESMTP id 3668rcjmkx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 22 Jan 2021 11:22:35 -0500 Received: from SCSQMBX10.ad.analog.com (SCSQMBX10.ad.analog.com [10.77.17.5]) by nwd2mta3.analog.com (8.14.7/8.14.7) with ESMTP id 10MGMXE1058184 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 22 Jan 2021 11:22:34 -0500 Received: from SCSQMBX11.ad.analog.com (10.77.17.10) by SCSQMBX10.ad.analog.com (10.77.17.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.721.2; Fri, 22 Jan 2021 08:22:32 -0800 Received: from zeus.spd.analog.com (10.66.68.11) by SCSQMBX11.ad.analog.com (10.77.17.10) with Microsoft SMTP Server id 15.1.1779.2 via Frontend Transport; Fri, 22 Jan 2021 08:22:32 -0800 Received: from localhost.localdomain ([10.48.65.12]) by zeus.spd.analog.com (8.15.1/8.15.1) with ESMTP id 10MGMOCq016711; Fri, 22 Jan 2021 11:22:30 -0500 From: Alexandru Ardelean To: , CC: , , , , , Alexandru Ardelean Subject: [PATCH v2 04/12][RESEND] iio: buffer: add index to the first IIO buffer dir and symlink it back Date: Fri, 22 Jan 2021 18:25:21 +0200 Message-ID: <20210122162529.84978-5-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210122162529.84978-1-alexandru.ardelean@analog.com> References: <20210122162529.84978-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRuleOP-NewSCL: Rule Triggered X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343,18.0.737 definitions=2021-01-22_11:2021-01-22,2021-01-22 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 mlxscore=0 spamscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 clxscore=1015 suspectscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2101220088 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org 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. Signed-off-by: Alexandru Ardelean --- drivers/iio/industrialio-buffer.c | 66 +++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 20 deletions(-) diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index 0f470d902790..628d78125126 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -1369,7 +1369,8 @@ static void iio_sysfs_del_attrs(struct kobject *kobj, struct attribute **ptr) * IIO device. */ 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; @@ -1401,7 +1402,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; @@ -1446,7 +1447,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; @@ -1477,6 +1478,22 @@ static int __iio_buffer_alloc_sysfs_and_mask(struct iio_buffer *buffer, return ret; } +/** + * __iio_buffer_free_sysfs_and_mask() - Free sysfs objects for a single IIO buffer + * @buffer: the iio buffer for which to destroy the objects + */ +static void __iio_buffer_free_sysfs_and_mask(struct iio_buffer *buffer) +{ + iio_sysfs_del_attrs(&buffer->scan_el_dir, buffer->scan_el_attrs); + kobject_put(&buffer->scan_el_dir); + kfree(buffer->scan_el_attrs); + bitmap_free(buffer->scan_mask); + iio_sysfs_del_attrs(&buffer->buffer_dir, buffer->buffer_attrs); + iio_free_chan_devattr_list(&buffer->scan_el_dev_attr_list); + kobject_put(&buffer->buffer_dir); + kfree(buffer->buffer_attrs); +} + /** * iio_buffer_alloc_sysfs_and_mask() - Allocate sysfs attributes to attached buffers * @indio_dev: the iio device for which to create the buffer sysfs attributes @@ -1492,7 +1509,7 @@ 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) { @@ -1506,23 +1523,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; -/** - * __iio_buffer_free_sysfs_and_mask() - Free sysfs objects for a single IIO buffer - * @buffer: the iio buffer for which to destroy the objects - */ -static void __iio_buffer_free_sysfs_and_mask(struct iio_buffer *buffer) -{ - iio_sysfs_del_attrs(&buffer->scan_el_dir, buffer->scan_el_attrs); - kobject_put(&buffer->scan_el_dir); - kfree(buffer->scan_el_attrs); - bitmap_free(buffer->scan_mask); - iio_sysfs_del_attrs(&buffer->buffer_dir, buffer->buffer_attrs); - iio_free_chan_devattr_list(&buffer->scan_el_dev_attr_list); - kobject_put(&buffer->buffer_dir); - kfree(buffer->buffer_attrs); + 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; } /** @@ -1538,6 +1561,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); }