From: Andrew Morton <akpm@osdl.org>
Date: Fri, 8 Dec 2006 10:38:36 +0000 (-0800)
Subject: [PATCH] mxser-workqueue-fixes
X-Git-Tag: v2.6.20-rc1~34^2~210
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=95a7b8b9a6453de2c52e469d1afdef80ca4607ae;p=~andy%2Flinux

[PATCH] mxser-workqueue-fixes

Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c
index 4555d597331..369d2742d6b 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);