CC: Jaroslav Kysela perex@perex.cz CC: Takashi Iwai tiwai@suse.com CC: Takashi Sakamoto o-takashi@sakamocchi.jp CC: "Hans P. Möller Ebner" hmoller@uc.cl CC: Kees Cook keescook@chromium.org CC: Kate Stewart kstewart@linuxfoundation.org CC: Thomas Gleixner tglx@linutronix.de CC: "Fabián Inostroza" soulsonceonfire@gmail.com CC: Bhumika Goyal bhumirks@gmail.com CC: Philippe Ombredanne pombredanne@nexb.com CC: Greg Kroah-Hartman gregkh@linuxfoundation.org CC: alsa-devel@alsa-project.org CC: linux-kernel@vger.kernel.org
This patch replaces all occurrences of 'unsigned' in sound/usb/line6 with 'unsigned int'.
Signed-off-by: Roman Sommer roman.sommer@fau.de Signed-off-by: Daniel Graefe daniel.graefe@fau.de --- sound/usb/line6/driver.c | 10 +++++----- sound/usb/line6/driver.h | 8 ++++---- sound/usb/line6/pcm.c | 4 ++-- sound/usb/line6/pcm.h | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index df7e761..fd176ef 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -346,13 +346,13 @@ static void line6_data_received(struct urb *urb) /* * Read data from device. */ -int line6_read_data(struct usb_line6 *line6, unsigned address, void *data, - unsigned datalen) +int line6_read_data(struct usb_line6 *line6, unsigned int address, void *data, + unsigned int datalen) { struct usb_device *usbdev = line6->usbdev; int ret; unsigned char len; - unsigned count; + unsigned int count;
if (address > 0xffff || datalen > 0xff) return -EINVAL; @@ -417,8 +417,8 @@ EXPORT_SYMBOL_GPL(line6_read_data); /* * Write data to device. */ -int line6_write_data(struct usb_line6 *line6, unsigned address, void *data, - unsigned datalen) +int line6_write_data(struct usb_line6 *line6, unsigned int address, void *data, + unsigned int datalen) { struct usb_device *usbdev = line6->usbdev; int ret; diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h index b307944..1dfb6de 100644 --- a/sound/usb/line6/driver.h +++ b/sound/usb/line6/driver.h @@ -187,8 +187,8 @@ struct usb_line6 {
extern char *line6_alloc_sysex_buffer(struct usb_line6 *line6, int code1, int code2, int size); -extern int line6_read_data(struct usb_line6 *line6, unsigned address, - void *data, unsigned datalen); +extern int line6_read_data(struct usb_line6 *line6, unsigned int address, + void *data, unsigned int datalen); extern int line6_read_serial_number(struct usb_line6 *line6, u32 *serial_number); extern int line6_send_raw_message_async(struct usb_line6 *line6, @@ -200,8 +200,8 @@ extern ssize_t line6_set_raw(struct device *dev, struct device_attribute *attr, extern void line6_start_timer(struct timer_list *timer, unsigned long msecs, void (*function)(struct timer_list *t)); extern int line6_version_request_async(struct usb_line6 *line6); -extern int line6_write_data(struct usb_line6 *line6, unsigned address, - void *data, unsigned datalen); +extern int line6_write_data(struct usb_line6 *line6, unsigned int address, + void *data, unsigned int datalen);
int line6_probe(struct usb_interface *interface, const struct usb_device_id *id, diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c index 20a2da3..c4d698c 100644 --- a/sound/usb/line6/pcm.c +++ b/sound/usb/line6/pcm.c @@ -529,8 +529,8 @@ int line6_init_pcm(struct usb_line6 *line6, struct line6_pcm_properties *properties) { int i, err; - unsigned ep_read = line6->properties->ep_audio_r; - unsigned ep_write = line6->properties->ep_audio_w; + unsigned int ep_read = line6->properties->ep_audio_r; + unsigned int ep_write = line6->properties->ep_audio_w; struct snd_pcm *pcm; struct snd_line6_pcm *line6pcm;
diff --git a/sound/usb/line6/pcm.h b/sound/usb/line6/pcm.h index acef244..cd1da40 100644 --- a/sound/usb/line6/pcm.h +++ b/sound/usb/line6/pcm.h @@ -104,13 +104,13 @@ struct line6_pcm_stream { /* Count processed bytes; * This is modulo period size (to determine when a period is finished). */ - unsigned bytes; + unsigned int bytes;
/* Counter to create desired sample rate */ - unsigned count; + unsigned int count;
/* period size in bytes */ - unsigned period; + unsigned int period;
/* Processed frame position in the buffer; * The contents of the ring buffer have been consumed by the USB