Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp2876617ybz; Mon, 27 Apr 2020 06:15:34 -0700 (PDT) X-Google-Smtp-Source: APiQypLJ//FxXIhjI8D4JIuUFsKybDwIDCHnRl6/lzrDiw6/uRXInv4q7InPtOhQdjWB4BJJ8OOM X-Received: by 2002:a50:951c:: with SMTP id u28mr17789050eda.310.1587993334513; Mon, 27 Apr 2020 06:15:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587993334; cv=none; d=google.com; s=arc-20160816; b=ZViujPkzuFmem9BPqDXroEH3rp1DqffzCNgmzNVUdwWvtHx7pIrPIOwsBUbOap1GoN qbL9bE2hP3AH0uwva56Gtcu7rHp4der3vK1XDMsJcWlASCWxpo4Z11+fllweZrkWZ5pM JYsq+jyBlwFTt76v/PjSdNEfa7qlBgw/H3GeQR8t3Mlm747Al4iQ6ExHp4AWMBrejPPU SDW5zpB5GDXusk+UMrcgUqbsDQh1pTKmM2hj6qbECr5/Em1aBwt+aMWhkyl10DcmKJ3O eIVrfvxXlJJOueu1VRsMcG3FiczB2K7RokNeaoYwGI2XPIT5BWaovEs+Xh9PeiBmxu6h +Kcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=x6yKmATbwt70GCVlICnVahnqVHkC+WtK/OFp2guDho4=; b=CcTFSB6P5/ycpQbWw7VERbtfBXjzamERja8rLTqCG08lvk4IdYVhEOTcvgswaVXedk 2d8+wbnEPBaqE0EyKls+fwFhpUM9Hg+vzQNCowiDZN/AeSLOfi1EsGvWDW1OFJPh6z3c rk6uhAmvyohwcphcSDW8q9JmYSIs5xO08rTb3YnEUIc2U6QkXY2AbkZQ62WTmKk2shGx H8gokFsYIrD3ls9j2pmrujv2ji8d4E9TpAwa8kXOSLIP0cJMkWC+ps3dsF8cpnEiTyVr 4aLltaoRIE+8PMYBMwphhoaQ6yMgA7nClh+WHQJ0Yqrl5YUYTGBNiEipPSuULoD4+Jrn cy1w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b26si7483542edx.291.2020.04.27.06.15.09; Mon, 27 Apr 2020 06:15:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727882AbgD0NLJ (ORCPT + 99 others); Mon, 27 Apr 2020 09:11:09 -0400 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:3690 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727859AbgD0NLI (ORCPT ); Mon, 27 Apr 2020 09:11:08 -0400 Received: from pps.filterd (m0167089.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 03RCvlA1022564; Mon, 27 Apr 2020 09:10:51 -0400 Received: from nwd2mta4.analog.com ([137.71.173.58]) by mx0a-00128a01.pphosted.com with ESMTP id 30mj457vke-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Apr 2020 09:10:50 -0400 Received: from ASHBMBX9.ad.analog.com (ashbmbx9.ad.analog.com [10.64.17.10]) by nwd2mta4.analog.com (8.14.7/8.14.7) with ESMTP id 03RDAns5010867 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=FAIL); Mon, 27 Apr 2020 09:10:49 -0400 Received: from ASHBMBX9.ad.analog.com (10.64.17.10) by ASHBMBX9.ad.analog.com (10.64.17.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1779.2; Mon, 27 Apr 2020 09:10:48 -0400 Received: from zeus.spd.analog.com (10.64.82.11) by ASHBMBX9.ad.analog.com (10.64.17.10) with Microsoft SMTP Server id 15.1.1779.2 via Frontend Transport; Mon, 27 Apr 2020 09:10:48 -0400 Received: from localhost.localdomain ([10.48.65.12]) by zeus.spd.analog.com (8.15.1/8.15.1) with ESMTP id 03RDAfUS011495; Mon, 27 Apr 2020 09:10:46 -0400 From: Alexandru Ardelean To: , CC: , , , Alexandru Ardelean Subject: [PATCH v6 2/6] iio: core,buffer: wrap iio_buffer_put() call into iio_buffers_put() Date: Mon, 27 Apr 2020 16:10:56 +0300 Message-ID: <20200427131100.50845-3-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200427131100.50845-1-alexandru.ardelean@analog.com> References: <20200427131100.50845-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 Content-Type: text/plain X-ADIRoutedOnPrem: True X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.676 definitions=2020-04-27_09:2020-04-24,2020-04-27 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 phishscore=0 suspectscore=2 malwarescore=0 spamscore=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 bulkscore=0 mlxlogscore=946 clxscore=1015 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004270114 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The name (and the wrapper) seems superfluous now, but when more buffers will be attached to the IIO device this will be a bit more useful. Signed-off-by: Alexandru Ardelean --- drivers/iio/iio_core.h | 4 ++++ drivers/iio/industrialio-buffer.c | 10 ++++++++++ drivers/iio/industrialio-core.c | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/iio/iio_core.h b/drivers/iio/iio_core.h index fd9a5f1d5e51..39ec0344fb68 100644 --- a/drivers/iio/iio_core.h +++ b/drivers/iio/iio_core.h @@ -51,6 +51,8 @@ void iio_buffer_free_sysfs_and_mask(struct iio_dev *indio_dev); #define iio_buffer_poll_addr (&iio_buffer_poll) #define iio_buffer_read_outer_addr (&iio_buffer_read_outer) +void iio_device_buffers_put(struct iio_dev *indio_dev); + void iio_disable_all_buffers(struct iio_dev *indio_dev); void iio_buffer_wakeup_poll(struct iio_dev *indio_dev); @@ -66,6 +68,8 @@ static inline int iio_buffer_alloc_sysfs_and_mask(struct iio_dev *indio_dev) static inline void iio_buffer_free_sysfs_and_mask(struct iio_dev *indio_dev) {} +static inline void iio_device_buffers_put(struct iio_dev *indio_dev) {} + static inline void iio_disable_all_buffers(struct iio_dev *indio_dev) {} static inline void iio_buffer_wakeup_poll(struct iio_dev *indio_dev) {} diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index bc5050191f51..a66d3fbc2905 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -1355,6 +1355,16 @@ void iio_buffer_free_sysfs_and_mask(struct iio_dev *indio_dev) iio_free_chan_devattr_list(&buffer->scan_el_dev_attr_list); } +void iio_device_buffers_put(struct iio_dev *indio_dev) +{ + struct iio_buffer *buffer = indio_dev->buffer; + + if (!buffer) + return; + + iio_buffer_put(buffer); +} + /** * iio_validate_scan_mask_onehot() - Validates that exactly one channel is selected * @indio_dev: the iio device diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 462d3e810013..32c489139cd2 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -1481,7 +1481,7 @@ static void iio_dev_release(struct device *device) iio_device_unregister_eventset(indio_dev); iio_device_unregister_sysfs(indio_dev); - iio_buffer_put(indio_dev->buffer); + iio_device_buffers_put(indio_dev); ida_simple_remove(&iio_ida, indio_dev->id); kfree(indio_dev); -- 2.17.1