diff options
author | Alan Cox <alan@linux.intel.com> | 2010-02-18 11:44:01 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 17:55:12 -0500 |
commit | a108bfcb372d8c4452701039308fb95747911c59 (patch) | |
tree | 3528621937692e28081f71131cddc3130e2641ad /drivers/usb/serial/opticon.c | |
parent | 2832fc11f1360668482beec06dbcd631ae5f0cf1 (diff) |
USB: tty: Prune uses of tty_request_room in the USB layer
We have lots of callers that do not need to do this in the first place.
Remove the calls as they both cost CPU and for big buffers can mess up the
multi-page allocation avoidance.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/opticon.c')
-rw-r--r-- | drivers/usb/serial/opticon.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c index 773286672ec9..f37476e22684 100644 --- a/drivers/usb/serial/opticon.c +++ b/drivers/usb/serial/opticon.c | |||
@@ -55,7 +55,6 @@ static void opticon_bulk_callback(struct urb *urb) | |||
55 | int status = urb->status; | 55 | int status = urb->status; |
56 | struct tty_struct *tty; | 56 | struct tty_struct *tty; |
57 | int result; | 57 | int result; |
58 | int available_room = 0; | ||
59 | int data_length; | 58 | int data_length; |
60 | 59 | ||
61 | dbg("%s - port %d", __func__, port->number); | 60 | dbg("%s - port %d", __func__, port->number); |
@@ -96,13 +95,9 @@ static void opticon_bulk_callback(struct urb *urb) | |||
96 | /* real data, send it to the tty layer */ | 95 | /* real data, send it to the tty layer */ |
97 | tty = tty_port_tty_get(&port->port); | 96 | tty = tty_port_tty_get(&port->port); |
98 | if (tty) { | 97 | if (tty) { |
99 | available_room = tty_buffer_request_room(tty, | 98 | tty_insert_flip_string(tty, data, |
100 | data_length); | 99 | data_length); |
101 | if (available_room) { | 100 | tty_flip_buffer_push(tty); |
102 | tty_insert_flip_string(tty, data, | ||
103 | available_room); | ||
104 | tty_flip_buffer_push(tty); | ||
105 | } | ||
106 | tty_kref_put(tty); | 101 | tty_kref_put(tty); |
107 | } | 102 | } |
108 | } else { | 103 | } else { |