From patchwork Mon Mar 30 14:56:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 11465755 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EDAF81667 for ; Mon, 30 Mar 2020 14:56:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C34A320781 for ; Mon, 30 Mar 2020 14:56:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g1s2mfvz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725268AbgC3O4e (ORCPT ); Mon, 30 Mar 2020 10:56:34 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:32839 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726403AbgC3O4e (ORCPT ); Mon, 30 Mar 2020 10:56:34 -0400 Received: by mail-wr1-f65.google.com with SMTP id a25so22076690wrd.0 for ; Mon, 30 Mar 2020 07:56:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fIaXa8uK/WZTy8opHuTaH+q3Qa7m/kORnCdBZQVGvYo=; b=g1s2mfvz83cLeWVJHuBjINaauvpDqI6hF9pzncoTEIy+eFQRmZLioAjYkiPxQlvdbH 7TyBrMOGD8kRaufLeoFCUV7QgZXD8vxQwDinxk5YsCHGMpKApKV9k67hpTvngGoyyICg bWomEi2oBUEtGDO6PPSaL2i9PTDEzPlUSrRON5BXkImLeFpxz2jqm/5C5H6dGijOm1OP wzasRna9RyAt4yqZ0WvN82HbHyPYvraLio+TlO4CAFJhJH02C+k5MvTxBFtFQ4L9zRFG ONK17OEqKRnMHd8BH4N+BrITl5hWYbXaYwVSHScA/UBUwcAMOUDZIGr7OblNrXiYChLg kXNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fIaXa8uK/WZTy8opHuTaH+q3Qa7m/kORnCdBZQVGvYo=; b=eiCNzoTAKM1ka50ZYSkCC7qQQ4J2uYGV+DXpX7tuQtbFZ/a8dsh2jFPxww0gyTrars LnQNfR7JxvKnacj5D1RUSDlHvD5f0l8rXdJKBHRGYOqjTA3Jl20wiVd7zS0SacFWLIvx t6Umzbs3k6zm+gSQawiPcZJFhON81JgEDVoxiSpUVBlZOy3YAZKBQXsbRlPDULY/+MzX GjhjflyS+Csv40f3Cknjm2ipAY4WuK0sG7/zgx88AiY6LyPIZ6N5T8lx611ReuwRXiLW ADGfmjU2/P/b0P1jSjOz7xNNd7uABCNZb5I6XQy0aq39Ta9/9P7LeLN6qcG+4HoYXAO+ ZPug== X-Gm-Message-State: ANhLgQ3Ddn7lKrlolDOt6+3nTGohlnzJlbx4PWVn2UATNB3b/u3okz6+ R8qtI242ojEBrQtgvD33yEsnkwT3 X-Google-Smtp-Source: ADFU+vstNQ4haq1hPjnpyfmmDW+5DK9WqrBPKWA+FEERyQcIOQtfaubW7/DruSEWS4L8AyWxI+Ws0Q== X-Received: by 2002:adf:90c6:: with SMTP id i64mr14707357wri.88.1585580191196; Mon, 30 Mar 2020 07:56:31 -0700 (PDT) Received: from saturn.lan ([188.26.73.247]) by smtp.gmail.com with ESMTPSA id y11sm23810136wrd.65.2020.03.30.07.56.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2020 07:56:30 -0700 (PDT) From: Alexandru Ardelean X-Google-Original-From: Alexandru Ardelean To: linux-iio@vger.kernel.org Cc: jic23@kernel.org, michael.henneric@analog.com, nuno.sa@analog.com, lars@metafoo.de, dragos.bogdan@analog.com, Alexandru Ardelean Subject: [RFC PATCH 1/3] iio: core: rename 'indio_dev->buffer_list' -> 'indio_dev->active_buffers' Date: Mon, 30 Mar 2020 17:56:21 +0300 Message-Id: <20200330145623.29210-2-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200330145623.29210-1-alexandru.ardelean@analog.com> References: <20200330145623.29210-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Since we want to add support for attaching multiple buffers, and we want to add a new list to 'struct iio_dev', it's a good idea to rename the current 'indio->buffer_list' to 'indio_dev->active_buffers'. Fortunately, this is a private field, which is used in 'drivers/iio/industrial-buffer.c', so this is simple to rename. Signed-off-by: Alexandru Ardelean --- drivers/iio/industrialio-buffer.c | 28 ++++++++++++++-------------- drivers/iio/industrialio-core.c | 2 +- include/linux/iio/iio.h | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index e6fa1a4e135d..a585c304cad4 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -591,7 +591,7 @@ static void iio_buffer_activate(struct iio_dev *indio_dev, struct iio_buffer *buffer) { iio_buffer_get(buffer); - list_add(&buffer->buffer_list, &indio_dev->buffer_list); + list_add(&buffer->buffer_list, &indio_dev->active_buffers); } static void iio_buffer_deactivate(struct iio_buffer *buffer) @@ -606,7 +606,7 @@ static void iio_buffer_deactivate_all(struct iio_dev *indio_dev) struct iio_buffer *buffer, *_buffer; list_for_each_entry_safe(buffer, _buffer, - &indio_dev->buffer_list, buffer_list) + &indio_dev->active_buffers, buffer_list) iio_buffer_deactivate(buffer); } @@ -701,12 +701,12 @@ static int iio_verify_update(struct iio_dev *indio_dev, * to verify. */ if (remove_buffer && !insert_buffer && - list_is_singular(&indio_dev->buffer_list)) + list_is_singular(&indio_dev->active_buffers)) return 0; modes = indio_dev->modes; - list_for_each_entry(buffer, &indio_dev->buffer_list, buffer_list) { + list_for_each_entry(buffer, &indio_dev->active_buffers, buffer_list) { if (buffer == remove_buffer) continue; modes &= buffer->access->modes; @@ -727,7 +727,7 @@ static int iio_verify_update(struct iio_dev *indio_dev, * Keep things simple for now and only allow a single buffer to * be connected in hardware mode. */ - if (insert_buffer && !list_empty(&indio_dev->buffer_list)) + if (insert_buffer && !list_empty(&indio_dev->active_buffers)) return -EINVAL; config->mode = INDIO_BUFFER_HARDWARE; strict_scanmask = true; @@ -747,7 +747,7 @@ static int iio_verify_update(struct iio_dev *indio_dev, scan_timestamp = false; - list_for_each_entry(buffer, &indio_dev->buffer_list, buffer_list) { + list_for_each_entry(buffer, &indio_dev->active_buffers, buffer_list) { if (buffer == remove_buffer) continue; bitmap_or(compound_mask, compound_mask, buffer->scan_mask, @@ -896,7 +896,7 @@ static int iio_update_demux(struct iio_dev *indio_dev) struct iio_buffer *buffer; int ret; - list_for_each_entry(buffer, &indio_dev->buffer_list, buffer_list) { + list_for_each_entry(buffer, &indio_dev->active_buffers, buffer_list) { ret = iio_buffer_update_demux(indio_dev, buffer); if (ret < 0) goto error_clear_mux_table; @@ -904,7 +904,7 @@ static int iio_update_demux(struct iio_dev *indio_dev) return 0; error_clear_mux_table: - list_for_each_entry(buffer, &indio_dev->buffer_list, buffer_list) + list_for_each_entry(buffer, &indio_dev->active_buffers, buffer_list) iio_buffer_demux_free(buffer); return ret; @@ -948,7 +948,7 @@ static int iio_enable_buffers(struct iio_dev *indio_dev, indio_dev->info->hwfifo_set_watermark(indio_dev, config->watermark); - list_for_each_entry(buffer, &indio_dev->buffer_list, buffer_list) { + list_for_each_entry(buffer, &indio_dev->active_buffers, buffer_list) { ret = iio_buffer_enable(buffer, indio_dev); if (ret) goto err_disable_buffers; @@ -968,7 +968,7 @@ static int iio_enable_buffers(struct iio_dev *indio_dev, return 0; err_disable_buffers: - list_for_each_entry_continue_reverse(buffer, &indio_dev->buffer_list, + list_for_each_entry_continue_reverse(buffer, &indio_dev->active_buffers, buffer_list) iio_buffer_disable(buffer, indio_dev); err_run_postdisable: @@ -988,7 +988,7 @@ static int iio_disable_buffers(struct iio_dev *indio_dev) int ret2; /* Wind down existing buffers - iff there are any */ - if (list_empty(&indio_dev->buffer_list)) + if (list_empty(&indio_dev->active_buffers)) return 0; /* @@ -1004,7 +1004,7 @@ static int iio_disable_buffers(struct iio_dev *indio_dev) ret = ret2; } - list_for_each_entry(buffer, &indio_dev->buffer_list, buffer_list) { + list_for_each_entry(buffer, &indio_dev->active_buffers, buffer_list) { ret2 = iio_buffer_disable(buffer, indio_dev); if (ret2 && !ret) ret = ret2; @@ -1052,7 +1052,7 @@ static int __iio_update_buffers(struct iio_dev *indio_dev, iio_buffer_activate(indio_dev, insert_buffer); /* If no buffers in list, we are done */ - if (list_empty(&indio_dev->buffer_list)) + if (list_empty(&indio_dev->active_buffers)) return 0; ret = iio_enable_buffers(indio_dev, &new_config); @@ -1413,7 +1413,7 @@ int iio_push_to_buffers(struct iio_dev *indio_dev, const void *data) int ret; struct iio_buffer *buf; - list_for_each_entry(buf, &indio_dev->buffer_list, buffer_list) { + list_for_each_entry(buf, &indio_dev->active_buffers, buffer_list) { ret = iio_push_to_buffer(buf, data); if (ret < 0) return ret; diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 157d95a24faa..a13957644c1d 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -1523,7 +1523,7 @@ struct iio_dev *iio_device_alloc(int sizeof_priv) return NULL; } dev_set_name(&dev->dev, "iio:device%d", dev->id); - INIT_LIST_HEAD(&dev->buffer_list); + INIT_LIST_HEAD(&dev->active_buffers); } return dev; diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h index e975020abaa6..a123f8acb192 100644 --- a/include/linux/iio/iio.h +++ b/include/linux/iio/iio.h @@ -490,7 +490,7 @@ struct iio_buffer_setup_ops { * and owner * @event_interface: [INTERN] event chrdevs associated with interrupt lines * @buffer: [DRIVER] any buffer present - * @buffer_list: [INTERN] list of all buffers currently attached + * @active_buffers: [INTERN] list of all buffers currently enabled/active * @scan_bytes: [INTERN] num bytes captured to be fed to buffer demux * @mlock: [INTERN] lock used to prevent simultaneous device state * changes @@ -534,7 +534,7 @@ struct iio_dev { struct iio_event_interface *event_interface; struct iio_buffer *buffer; - struct list_head buffer_list; + struct list_head active_buffers; int scan_bytes; struct mutex mlock;