diff options
author | Tejun Heo <tj@kernel.org> | 2011-01-24 11:53:41 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-03 17:16:49 -0500 |
commit | f094298bae5f5d0e1cb3bff4621aae7ef486812a (patch) | |
tree | ccdecb7d66c702eeda27863b8fc9030196753763 | |
parent | 5933a161abcb8d83a2c145177f48027c3c0a8995 (diff) |
68328serial: remove unsed m68k_serial->tqueue_hangup
m68k_serial->tqueue_hangup is unused. Remove it.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/tty/serial/68328serial.c | 23 | ||||
-rw-r--r-- | drivers/tty/serial/68328serial.h | 1 |
2 files changed, 0 insertions, 24 deletions
diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c index be0ebce36e54..a9d99856c892 100644 --- a/drivers/tty/serial/68328serial.c +++ b/drivers/tty/serial/68328serial.c | |||
@@ -393,28 +393,6 @@ static void do_softint(struct work_struct *work) | |||
393 | #endif | 393 | #endif |
394 | } | 394 | } |
395 | 395 | ||
396 | /* | ||
397 | * This routine is called from the scheduler tqueue when the interrupt | ||
398 | * routine has signalled that a hangup has occurred. The path of | ||
399 | * hangup processing is: | ||
400 | * | ||
401 | * serial interrupt routine -> (scheduler tqueue) -> | ||
402 | * do_serial_hangup() -> tty->hangup() -> rs_hangup() | ||
403 | * | ||
404 | */ | ||
405 | static void do_serial_hangup(struct work_struct *work) | ||
406 | { | ||
407 | struct m68k_serial *info = container_of(work, struct m68k_serial, tqueue_hangup); | ||
408 | struct tty_struct *tty; | ||
409 | |||
410 | tty = info->port.tty; | ||
411 | if (!tty) | ||
412 | return; | ||
413 | |||
414 | tty_hangup(tty); | ||
415 | } | ||
416 | |||
417 | |||
418 | static int startup(struct m68k_serial * info) | 396 | static int startup(struct m68k_serial * info) |
419 | { | 397 | { |
420 | m68328_uart *uart = &uart_addr[info->line]; | 398 | m68328_uart *uart = &uart_addr[info->line]; |
@@ -1348,7 +1326,6 @@ rs68328_init(void) | |||
1348 | info->count = 0; | 1326 | info->count = 0; |
1349 | info->blocked_open = 0; | 1327 | info->blocked_open = 0; |
1350 | INIT_WORK(&info->tqueue, do_softint); | 1328 | INIT_WORK(&info->tqueue, do_softint); |
1351 | INIT_WORK(&info->tqueue_hangup, do_serial_hangup); | ||
1352 | init_waitqueue_head(&info->open_wait); | 1329 | init_waitqueue_head(&info->open_wait); |
1353 | init_waitqueue_head(&info->close_wait); | 1330 | init_waitqueue_head(&info->close_wait); |
1354 | info->line = i; | 1331 | info->line = i; |
diff --git a/drivers/tty/serial/68328serial.h b/drivers/tty/serial/68328serial.h index 664ceb0a158c..8c9c3c0745db 100644 --- a/drivers/tty/serial/68328serial.h +++ b/drivers/tty/serial/68328serial.h | |||
@@ -159,7 +159,6 @@ struct m68k_serial { | |||
159 | int xmit_tail; | 159 | int xmit_tail; |
160 | int xmit_cnt; | 160 | int xmit_cnt; |
161 | struct work_struct tqueue; | 161 | struct work_struct tqueue; |
162 | struct work_struct tqueue_hangup; | ||
163 | wait_queue_head_t open_wait; | 162 | wait_queue_head_t open_wait; |
164 | wait_queue_head_t close_wait; | 163 | wait_queue_head_t close_wait; |
165 | }; | 164 | }; |