From patchwork Wed Feb 11 05:03:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Rorvick X-Patchwork-Id: 5810301 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1B4FE9F30C for ; Wed, 11 Feb 2015 05:05:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 39CE620219 for ; Wed, 11 Feb 2015 05:05:42 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 11C5020218 for ; Wed, 11 Feb 2015 05:05:41 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 55C0B261AA3; Wed, 11 Feb 2015 06:05:35 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id E304F2605F3; Wed, 11 Feb 2015 06:03:53 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 765C4261684; Wed, 11 Feb 2015 06:03:53 +0100 (CET) Received: from mail-ig0-f171.google.com (mail-ig0-f171.google.com [209.85.213.171]) by alsa0.perex.cz (Postfix) with ESMTP id A3BA626061D for ; Wed, 11 Feb 2015 06:03:42 +0100 (CET) Received: by mail-ig0-f171.google.com with SMTP id h15so28480161igd.4 for ; Tue, 10 Feb 2015 21:03:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=xzQrBYa3FL4ggn3T5wM98E0N/J37furTWTBGAwC0hC0=; b=IDAG9t8IIco44lcYhPvolvcLNuhBgBHG5kpJRsat8ws8ie2clUtmD4nWJN3lC+KVf2 LWD28LtC+pAeEDb7ivZ0F4W+Lh79XlO6RDCMP/LJKY9bNdLsk6PC5OEExhWGkI4v8Zq3 cwqwlWD+5dgMzUc7P4QAYsx6Xui9ly/EkqrLqyxop71ysydi/ObB1buX3rz71TsqN4kK nXjrG1ZLZwrMIHC0THRZWxvYn0jfvgM4oHlnUzjhbrDbRrJOyJmMrCq3m84uXdFWvgVj OgsjzCbf+02+l14xkTiBsB5jjr4q1DbCvsrwJqIcgiMd4lKZzf5dJHWC/lbb0l0t/nED cnIw== X-Received: by 10.43.19.134 with SMTP id qk6mr1216766icb.29.1423631022154; Tue, 10 Feb 2015 21:03:42 -0800 (PST) Received: from localhost.localdomain.com ([99.135.164.179]) by mx.google.com with ESMTPSA id qd2sm9291297igc.22.2015.02.10.21.03.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Feb 2015 21:03:41 -0800 (PST) From: Chris Rorvick To: Takashi Iwai 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> Cc: Stefan Hajnoczi , alsa-devel@alsa-project.org, Chris Rorvick , linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH 5/6] ALSA: line6: Use explicit type for serial number X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP 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;