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 5/6] ALSA: line6: Use explicit type for serial number
Date: Tue, 10 Feb 2015 23:03:16 -0600 [thread overview]
Message-ID: <1423630997-25464-6-git-send-email-chris@rorvick.com> (raw)
In-Reply-To: <1423630997-25464-1-git-send-email-chris@rorvick.com>
The serial number (aka ESN) is a 32-bit value.
Signed-off-by: Chris Rorvick <chris@rorvick.com>
---
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
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 ` [PATCH 1/6] ALSA: line6: Improve line6_read/write_data() interfaces Chris Rorvick
2015-02-11 9:33 ` 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 ` Chris Rorvick [this message]
2015-02-11 9:43 ` [PATCH 5/6] ALSA: line6: Use explicit type for serial number 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-6-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