Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 235512
b: refs/heads/master
c: f094298
h: refs/heads/master
v: v3
  • Loading branch information
Tejun Heo authored and Greg Kroah-Hartman committed Feb 3, 2011
1 parent 9bdc4d6 commit 1d654fc
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 25 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5933a161abcb8d83a2c145177f48027c3c0a8995
refs/heads/master: f094298bae5f5d0e1cb3bff4621aae7ef486812a
23 changes: 0 additions & 23 deletions trunk/drivers/tty/serial/68328serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -393,28 +393,6 @@ static void do_softint(struct work_struct *work)
#endif
}

/*
* This routine is called from the scheduler tqueue when the interrupt
* routine has signalled that a hangup has occurred. The path of
* hangup processing is:
*
* serial interrupt routine -> (scheduler tqueue) ->
* do_serial_hangup() -> tty->hangup() -> rs_hangup()
*
*/
static void do_serial_hangup(struct work_struct *work)
{
struct m68k_serial *info = container_of(work, struct m68k_serial, tqueue_hangup);
struct tty_struct *tty;

tty = info->port.tty;
if (!tty)
return;

tty_hangup(tty);
}


static int startup(struct m68k_serial * info)
{
m68328_uart *uart = &uart_addr[info->line];
Expand Down Expand Up @@ -1348,7 +1326,6 @@ rs68328_init(void)
info->count = 0;
info->blocked_open = 0;
INIT_WORK(&info->tqueue, do_softint);
INIT_WORK(&info->tqueue_hangup, do_serial_hangup);
init_waitqueue_head(&info->open_wait);
init_waitqueue_head(&info->close_wait);
info->line = i;
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/tty/serial/68328serial.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ struct m68k_serial {
int xmit_tail;
int xmit_cnt;
struct work_struct tqueue;
struct work_struct tqueue_hangup;
wait_queue_head_t open_wait;
wait_queue_head_t close_wait;
};
Expand Down

0 comments on commit 1d654fc

Please sign in to comment.