diff options
| author | Greg Ungerer <gerg@snapgear.com> | 2007-07-25 22:07:20 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-25 11:05:01 -0700 |
| commit | 931f9cde5c3f9dc7827759db258eaf979bfa92b6 (patch) | |
| tree | 6be964d788d81f8fc2c5740d560063c9c8b8d655 /drivers/serial | |
| parent | a427138712f388987aa13475bf591685b6b8cd46 (diff) | |
| download | op-kernel-dev-931f9cde5c3f9dc7827759db258eaf979bfa92b6.zip op-kernel-dev-931f9cde5c3f9dc7827759db258eaf979bfa92b6.tar.gz | |
m68knommu: fix workqueues in 68328 serial driver
Fix workqueues in 68328 serial driver.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/68328serial.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c index 151bd9a..aad4012 100644 --- a/drivers/serial/68328serial.c +++ b/drivers/serial/68328serial.c @@ -400,9 +400,9 @@ irqreturn_t rs_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static void do_softint(void *private) +static void do_softint(struct work_struct *work) { - struct m68k_serial *info = (struct m68k_serial *) private; + struct m68k_serial *info = container_of(work, struct m68k_serial, tqueue); struct tty_struct *tty; tty = info->tty; @@ -424,9 +424,9 @@ static void do_softint(void *private) * do_serial_hangup() -> tty->hangup() -> rs_hangup() * */ -static void do_serial_hangup(void *private) +static void do_serial_hangup(struct work_struct *work) { - struct m68k_serial *info = (struct m68k_serial *) private; + struct m68k_serial *info = container_of(work, struct m68k_serial, tqueue_hangup); struct tty_struct *tty; tty = info->tty; @@ -1390,8 +1390,8 @@ rs68328_init(void) info->event = 0; info->count = 0; info->blocked_open = 0; - INIT_WORK(&info->tqueue, do_softint, info); - INIT_WORK(&info->tqueue_hangup, do_serial_hangup, info); + 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; |
