From: Ian Abbott <abbotti@mev.co.uk>
To: driverdev-devel@linuxdriverproject.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Ian Abbott <abbotti@mev.co.uk>,
H Hartley Sweeten <hartleys@visionengravers.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 08/11] staging: comedi: comedi_fc.h: use comedi_write_array_to_buffer()
Date: Mon, 15 Sep 2014 13:46:04 +0100 [thread overview]
Message-ID: <1410785167-28506-9-git-send-email-abbotti@mev.co.uk> (raw)
In-Reply-To: <1410785167-28506-1-git-send-email-abbotti@mev.co.uk>
Since `cfc_write_array_to_buffer()` is just an inline function that
calls `comedi_write_array_to_buffer()`, replace calls to the former to
the latter in the "comedi_fc.h" header. This is part of the migration
of functionality from the "comedi_fc" module to the core "comedi"
module.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/staging/comedi/comedi_buf.c | 13 ++++++++++++-
drivers/staging/comedi/drivers/comedi_fc.h | 4 ++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/comedi_buf.c b/drivers/staging/comedi/comedi_buf.c
index 5aa8684..52a75d2 100644
--- a/drivers/staging/comedi/comedi_buf.c
+++ b/drivers/staging/comedi/comedi_buf.c
@@ -510,7 +510,18 @@ void comedi_buf_memcpy_from(struct comedi_subdevice *s, unsigned int offset,
}
EXPORT_SYMBOL_GPL(comedi_buf_memcpy_from);
-/* Writes an array of data points to comedi's buffer */
+/**
+ * comedi_write_array_to_buffer - write data to comedi buffer
+ * @s: comedi_subdevice struct
+ * @data: destination
+ * @num_bytes: number of bytes to write
+ *
+ * Writes up to num_bytes bytes of data to the comedi buffer associated with
+ * the subdevice, marks it as written and updates the acquisition scan
+ * progress.
+ *
+ * Returns the amount of data written in bytes.
+ */
unsigned int comedi_write_array_to_buffer(struct comedi_subdevice *s,
const void *data,
unsigned int num_bytes)
diff --git a/drivers/staging/comedi/drivers/comedi_fc.h b/drivers/staging/comedi/drivers/comedi_fc.h
index 51b3157..75bbc31 100644
--- a/drivers/staging/comedi/drivers/comedi_fc.h
+++ b/drivers/staging/comedi/drivers/comedi_fc.h
@@ -44,13 +44,13 @@ static inline unsigned int cfc_write_array_to_buffer(struct comedi_subdevice *s,
static inline unsigned int cfc_write_to_buffer(struct comedi_subdevice *s,
unsigned short data)
{
- return cfc_write_array_to_buffer(s, &data, sizeof(data));
+ return comedi_write_array_to_buffer(s, &data, sizeof(data));
};
static inline unsigned int cfc_write_long_to_buffer(struct comedi_subdevice *s,
unsigned int data)
{
- return cfc_write_array_to_buffer(s, &data, sizeof(data));
+ return comedi_write_array_to_buffer(s, &data, sizeof(data));
};
unsigned int cfc_read_array_from_buffer(struct comedi_subdevice *,
--
2.1.0
next prev parent reply other threads:[~2014-09-15 12:47 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-15 12:45 [PATCH 00/11] staging: comedi: move comedi_fc functionality into core Ian Abbott
2014-09-15 12:45 ` [PATCH 01/11] staging: comedi: add comedi_bytes_per_scan() Ian Abbott
2014-09-15 18:12 ` Hartley Sweeten
2014-09-15 12:45 ` [PATCH 02/11] staging: comedi: comedi_fc: use comedi_bytes_per_scan() Ian Abbott
2014-09-15 12:45 ` [PATCH 03/11] staging: comedi: add comedi_inc_scan_progress() Ian Abbott
2014-09-15 18:14 ` Hartley Sweeten
2014-09-15 12:46 ` [PATCH 04/11] staging: comedi: comedi_fc: use comedi_inc_scan_progress() Ian Abbott
2014-09-15 12:46 ` [PATCH 05/11] staging: comedi: add comedi_handle_events() Ian Abbott
2014-09-15 18:17 ` Hartley Sweeten
2014-09-15 12:46 ` [PATCH 06/11] staging: comedi: comedi_fc: cfc_write_array_to_buffer() data is const Ian Abbott
2014-09-15 12:46 ` [PATCH 07/11] staging: comedi: add comedi_write_array_to_buffer() Ian Abbott
2014-09-15 12:46 ` Ian Abbott [this message]
2014-09-15 12:46 ` [PATCH 09/11] staging: comedi: add comedi_read_array_from_buffer() Ian Abbott
2014-09-15 12:46 ` [PATCH 10/11] staging: comedi: migrate copyrights from "comedi_fc.c" Ian Abbott
2014-09-15 12:46 ` [PATCH 11/11] staging: comedi: remove comedi_fc module Ian Abbott
2014-09-15 18:07 ` Hartley Sweeten
2014-09-15 18:21 ` [PATCH 00/11] staging: comedi: move comedi_fc functionality into core Hartley Sweeten
2014-09-16 7:44 ` Ian Abbott
2014-09-16 16:13 ` Hartley Sweeten
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1410785167-28506-9-git-send-email-abbotti@mev.co.uk \
--to=abbotti@mev.co.uk \
--cc=driverdev-devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=hartleys@visionengravers.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®