[alsa-devel] [PATCH 5/6] ALSA: line6: Use explicit type for serial number

[Takashi Iwai]

At Tue, 10 Feb 2015 23:03:16 -0600,
Chris Rorvick wrote:
> 
> The serial number (aka ESN) is a 32-bit value.
> 
> Signed-off-by: Chris Rorvick <chris at rorvick.com>

Applied, thanks.


Takashi

> ---
>  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
>