Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751557AbbBKFDk (ORCPT ); Wed, 11 Feb 2015 00:03:40 -0500 Received: from mail-ig0-f180.google.com ([209.85.213.180]:45893 "EHLO mail-ig0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750906AbbBKFDi (ORCPT ); Wed, 11 Feb 2015 00:03:38 -0500 From: Chris Rorvick To: Takashi Iwai Cc: Chris Rorvick , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Stefan Hajnoczi Subject: [PATCH 1/6] ALSA: line6: Improve line6_read/write_data() interfaces Date: Tue, 10 Feb 2015 23:03:12 -0600 Message-Id: <1423630997-25464-2-git-send-email-chris@rorvick.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1423630997-25464-1-git-send-email-chris@rorvick.com> References: <1423630997-25464-1-git-send-email-chris@rorvick.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2928 Lines: 77 Use explicit types to reflect the range of valid values. Signed-off-by: Chris Rorvick --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/