Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6fb6b8846458afb7b5689f86cf35705c40eb70e5

Authored by Johan Hovold
Committed by Greg Kroah-Hartman
1 parent 3a42610812
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

USB: cdc-acm: remove unused drain-delay code 

The drain-delay code is no longer used, so remove it.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 2 changed files with 0 additions and 7 deletions Side-by-side Diff

drivers/usb/class/cdc-acm.c
Diff comments   View file @ 6fb6b88
... ... @@ -50,9 +50,6 @@
50 50 #include "cdc-acm.h"
51 51  
52 52  
53   -#define ACM_CLOSE_TIMEOUT 15 /* seconds to let writes drain */
54   -
55   -
56 53 #define DRIVER_AUTHOR "Armin Fuerst, Pavel Machek, Johannes Erdfelt, Vojtech Pavlik, David Kubicek"
57 54 #define DRIVER_DESC "USB Abstract Control Model driver for USB modems and ISDN adapters"
58 55  
... ... @@ -507,8 +504,6 @@
507 504 spin_unlock_irqrestore(&acm->write_lock, flags);
508 505 if (ACM_READY(acm))
509 506 schedule_work(&acm->work);
510   - else
511   - wake_up_interruptible(&acm->drain_wait);
512 507 }
513 508  
514 509 static void acm_softint(struct work_struct *work)
... ... @@ -1155,7 +1150,6 @@
1155 1150 acm->urb_task.func = acm_rx_tasklet;
1156 1151 acm->urb_task.data = (unsigned long) acm;
1157 1152 INIT_WORK(&acm->work, acm_softint);
1158   - init_waitqueue_head(&acm->drain_wait);
1159 1153 spin_lock_init(&acm->throttle_lock);
1160 1154 spin_lock_init(&acm->write_lock);
1161 1155 spin_lock_init(&acm->read_lock);
drivers/usb/class/cdc-acm.h
Diff comments   View file @ 6fb6b88
... ... @@ -112,7 +112,6 @@
112 112 struct mutex mutex;
113 113 struct usb_cdc_line_coding line; /* bits, stop, parity */
114 114 struct work_struct work; /* work queue entry for line discipline waking up */
115   - wait_queue_head_t drain_wait; /* close processing */
116 115 struct tasklet_struct urb_task; /* rx processing */
117 116 spinlock_t throttle_lock; /* synchronize throtteling and read callback */
118 117 unsigned int ctrlin; /* input control lines (DCD, DSR, RI, break, overruns) */