Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752687AbbBKFEG (ORCPT ); Wed, 11 Feb 2015 00:04:06 -0500 Received: from mail-ig0-f176.google.com ([209.85.213.176]:34061 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751674AbbBKFDm (ORCPT ); Wed, 11 Feb 2015 00:03:42 -0500 From: Chris Rorvick To: Takashi Iwai Cc: Chris Rorvick , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Stefan Hajnoczi Subject: [PATCH 5/6] ALSA: line6: Use explicit type for serial number Date: Tue, 10 Feb 2015 23:03:16 -0600 Message-Id: <1423630997-25464-6-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: 2724 Lines: 79 The serial number (aka ESN) is a 32-bit value. Signed-off-by: Chris Rorvick --- sound/usb/line6/driver.c | 2 +- sound/usb/line6/driver.h | 2 +- sound/usb/line6/pod.c | 4 ++-- sound/usb/line6/toneport.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index f8e2eb0..d31ceb8 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -426,7 +426,7 @@ EXPORT_SYMBOL_GPL(line6_write_data); Read Line 6 device serial number. (POD, TonePort, GuitarPort) */ -int line6_read_serial_number(struct usb_line6 *line6, int *serial_number) +int line6_read_serial_number(struct usb_line6 *line6, u32 *serial_number) { return line6_read_data(line6, 0x80d0, serial_number, sizeof(*serial_number)); diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h index 603bdc4..b281bff 100644 --- a/sound/usb/line6/driver.h +++ b/sound/usb/line6/driver.h @@ -150,7 +150,7 @@ extern char *line6_alloc_sysex_buffer(struct usb_line6 *line6, int code1, 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); + u32 *serial_number); extern int line6_send_raw_message_async(struct usb_line6 *line6, const char *buffer, int size); extern int line6_send_sysex_message(struct usb_line6 *line6, diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c index c4246ad..425d22d 100644 --- a/sound/usb/line6/pod.c +++ b/sound/usb/line6/pod.c @@ -73,7 +73,7 @@ struct usb_line6_pod { int startup_progress; /* Serial number of device */ - int serial_number; + u32 serial_number; /* Firmware version (x 100) */ int firmware_version; @@ -247,7 +247,7 @@ static ssize_t serial_number_show(struct device *dev, struct usb_interface *interface = to_usb_interface(dev); struct usb_line6_pod *pod = usb_get_intfdata(interface); - return sprintf(buf, "%d\n", pod->serial_number); + return sprintf(buf, "%u\n", pod->serial_number); } /* diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c index 1a0a485..ddf7368 100644 --- a/sound/usb/line6/toneport.c +++ b/sound/usb/line6/toneport.c @@ -49,7 +49,7 @@ struct usb_line6_toneport { int source; /* Serial number of device */ - int serial_number; + u32 serial_number; /* Firmware version (x 100) */ int firmware_version; -- 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/