From: Chris Rorvick <chris@rorvick.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: Chris Rorvick <chris@rorvick.com>,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
Stefan Hajnoczi <stefanha@gmail.com>
Subject: [PATCH 1/6] ALSA: line6: Improve line6_read/write_data() interfaces
Date: Tue, 10 Feb 2015 23:03:12 -0600 [thread overview]
Message-ID: <1423630997-25464-2-git-send-email-chris@rorvick.com> (raw)
In-Reply-To: <1423630997-25464-1-git-send-email-chris@rorvick.com>
Use explicit types to reflect the range of valid values.
Signed-off-by: Chris Rorvick <chris@rorvick.com>
---
sound/usb/line6/driver.c | 10 +++++-----
sound/usb/line6/driver.h | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index 1e58e92..aac1e35 100644
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -299,8 +299,8 @@ static void line6_data_received(struct urb *urb)
/*
Read data from device.
*/
-int line6_read_data(struct usb_line6 *line6, int address, void *data,
- size_t datalen)
+int line6_read_data(struct usb_line6 *line6, u16 address, void *data,
+ u8 datalen)
{
struct usb_device *usbdev = line6->usbdev;
int ret;
@@ -309,7 +309,7 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
/* query the serial number: */
ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
- (datalen << 8) | 0x21, address,
+ ((u16) datalen << 8) | 0x21, address,
NULL, 0, LINE6_TIMEOUT * HZ);
if (ret < 0) {
@@ -357,8 +357,8 @@ EXPORT_SYMBOL_GPL(line6_read_data);
/*
Write data to device.
*/
-int line6_write_data(struct usb_line6 *line6, int address, void *data,
- size_t datalen)
+int line6_write_data(struct usb_line6 *line6, u16 address, void *data,
+ u16 datalen)
{
struct usb_device *usbdev = line6->usbdev;
int ret;
diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h
index 8247a6b..603bdc4 100644
--- a/sound/usb/line6/driver.h
+++ b/sound/usb/line6/driver.h
@@ -147,8 +147,8 @@ struct usb_line6 {
extern char *line6_alloc_sysex_buffer(struct usb_line6 *line6, int code1,
int code2, int size);
-extern int line6_read_data(struct usb_line6 *line6, int address, void *data,
- size_t datalen);
+extern int line6_read_data(struct usb_line6 *line6, u16 address, void *data,
+ u8 datalen);
extern int line6_read_serial_number(struct usb_line6 *line6,
int *serial_number);
extern int line6_send_raw_message_async(struct usb_line6 *line6,
@@ -161,8 +161,8 @@ extern void line6_start_timer(struct timer_list *timer, unsigned int msecs,
void (*function)(unsigned long),
unsigned long data);
extern int line6_version_request_async(struct usb_line6 *line6);
-extern int line6_write_data(struct usb_line6 *line6, int address, void *data,
- size_t datalen);
+extern int line6_write_data(struct usb_line6 *line6, u16 address, void *data,
+ u16 datalen);
int line6_probe(struct usb_interface *interface,
const struct usb_device_id *id,
--
2.1.0
next prev parent reply other threads:[~2015-02-11 5:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-11 5:03 [PATCH 0/6] Cleanup reads/writes to Line 6 device memory Chris Rorvick
2015-02-11 5:03 ` Chris Rorvick [this message]
2015-02-11 9:33 ` [PATCH 1/6] ALSA: line6: Improve line6_read/write_data() interfaces Takashi Iwai
2015-02-11 11:58 ` Chris Rorvick
2015-02-11 5:03 ` [PATCH 2/6] ALSA: line6: Add delay before reading status Chris Rorvick
2015-02-11 9:34 ` Takashi Iwai
2015-02-11 5:03 ` [PATCH 3/6] ALSA: line6: Return error if device not responding Chris Rorvick
2015-02-11 9:43 ` Takashi Iwai
2015-02-11 5:03 ` [PATCH 4/6] ALSA: line6: Return EIO if read/write not successful Chris Rorvick
2015-02-11 9:43 ` Takashi Iwai
2015-02-11 5:03 ` [PATCH 5/6] ALSA: line6: Use explicit type for serial number Chris Rorvick
2015-02-11 9:43 ` Takashi Iwai
2015-02-11 5:03 ` [PATCH 6/6] ALSA: line6: toneport: Use explicit type for firmware version Chris Rorvick
2015-02-11 9:43 ` Takashi Iwai
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=1423630997-25464-2-git-send-email-chris@rorvick.com \
--to=chris@rorvick.com \
--cc=alsa-devel@alsa-project.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stefanha@gmail.com \
--cc=tiwai@suse.de \
/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