From 95a7b8b9a6453de2c52e469d1afdef80ca4607ae Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 8 Dec 2006 02:38:36 -0800 Subject: [PATCH] [PATCH] mxser-workqueue-fixes Cc: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/char/mxser_new.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c index 4555d59733..369d2742d6 100644 --- a/drivers/char/mxser_new.c +++ b/drivers/char/mxser_new.c @@ -358,9 +358,9 @@ static void process_txrx_fifo(struct mxser_port *info) } } -static void mxser_do_softint(void *private_) +static void mxser_do_softint(struct work_struct *work) { - struct mxser_port *info = private_; + struct mxser_port *info = container_of(work, struct mxser_port, tqueue); struct tty_struct *tty = info->tty; if (test_and_clear_bit(MXSER_EVENT_TXLOW, &info->event)) @@ -2416,7 +2416,7 @@ static int __devinit mxser_initbrd(struct mxser_board *brd, info->custom_divisor = info->baud_base * 16; info->close_delay = 5 * HZ / 10; info->closing_wait = 30 * HZ; - INIT_WORK(&info->tqueue, mxser_do_softint, info); + INIT_WORK(&info->tqueue, mxser_do_softint); info->normal_termios = mxvar_sdriver->init_termios; init_waitqueue_head(&info->open_wait); init_waitqueue_head(&info->close_wait); -- 2.39.5