ALSA: line6: Use explicit type for serial number
authorChris Rorvick <chris@rorvick.com>
Wed, 11 Feb 2015 05:03:16 +0000 (23:03 -0600)
committerTakashi Iwai <tiwai@suse.de>
Wed, 11 Feb 2015 09:39:05 +0000 (10:39 +0100)
The serial number (aka ESN) is a 32-bit value.

Signed-off-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/line6/driver.c
sound/usb/line6/driver.h
sound/usb/line6/pod.c
sound/usb/line6/toneport.c

index 6c2d418b53f19c9697531cea4644b02c753949fc..99b63a7902f302f4a432425d7a6c3d23dbd571f7 100644 (file)
@@ -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));
index 92a662a0469e36dcdc347ed3d419cfd541f71e3d..5d20294d64f43be80334bb0a902deb7ff7e63da0 100644 (file)
@@ -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, int address, void *data,
                           size_t 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,
index 09017bc9615b8657cca6843ef7c1314167b2d69d..daf81d169a42043f265a48df58afcc5490d40f97 100644 (file)
@@ -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);
 }
 
 /*
index 1a0a485b66543d10f83b6856ba8894496533f52e..ddf7368c2001105e142d24c318f9295c2ef5ace1 100644 (file)
@@ -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;