CDC-ACM: cleanup of data structures
Subsystems (2)
Oliver Neukum
maintainerPATCH 1/1 CDC-ACM: cleanup of data structures
Buffers should be u8*, not unsigned char*
Buffers have an unsigned length and using an int
as a boolean is a bit outdated.
No functional change intended.
Signed-off-by Oliver Neukum <[email protected]>
--- drivers/usb/class/cdc-acm.c | 13 +++++++------ drivers/usb/class/cdc-acm.h | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-)
drivers/usb/class/cdc-acm.c +7 -6
@@ -173,7 +173,7 @@ static int acm_wb_alloc(struct acm *acm)for (;;) { wb = &acm->wb[wbn];if (!wb->use) { - wb->use =1 ; + wb->use = true; wb->len =0 ;return wbn; }
@@ -191,7 +191,8 @@ static int acm_wb_is_avail(struct acm *acm) n =ACM_NW ;spin_lock_irqsave (&acm->write_lock, flags);for (i =0 ; i <ACM_NW ; i++) - n -= acm->wb[i].use; +if (acm->wb[i].use) + n--;spin_unlock_irqrestore (&acm->write_lock, flags);return n; }
@@ -201,7 +202,7 @@ static int acm_wb_is_avail(struct acm *acm)*/ static void acm_write_done (struct acm *acm,struct acm_wb *wb) { - wb->use =0 ; + wb->use = false; acm->transmitting--;usb_autopm_put_interface_async (acm->control); }
@@ -745,7 +746,7 @@ static void acm_port_shutdown(struct tty_port *port)if (!urb)break ; wb = urb->context; - wb->use =0 ; + wb->use = false;usb_autopm_put_interface_async (acm->control); }
@@ -796,7 +797,7 @@ static int acm_tty_write(struct tty_struct *tty, wb = &acm->wb[wbn];if (!acm->dev) { - wb->use =0 ; + wb->use = false;spin_unlock_irqrestore (&acm->write_lock, flags);return -ENODEV ; }
@@ -808,7 +809,7 @@ static int acm_tty_write(struct tty_struct *tty, stat =usb_autopm_get_interface_async (acm->control);if (stat) { - wb->use =0 ; + wb->use = false;spin_unlock_irqrestore (&acm->write_lock, flags);return stat; }
drivers/usb/class/cdc-acm.h +3 -3
@@ -64,12 +64,12 @@#define ACM_NR 16struct acm_wb { -unsigned char *buf; +u8 *buf;dma_addr_t dmah; -int len; -int use; +unsigned int len;struct urb *urb;struct acm *instance; +bool use; };struct acm_rb {
Signature · 1 line
2.16.4