From: Greg Ungerer Date: Wed, 25 Jul 2007 12:07:20 +0000 (+1000) Subject: m68knommu: fix workqueues in 68328 serial driver X-Git-Tag: firefly_0821_release~27165 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=931f9cde5c3f9dc7827759db258eaf979bfa92b6;p=firefly-linux-kernel-4.4.55.git m68knommu: fix workqueues in 68328 serial driver Fix workqueues in 68328 serial driver. Signed-off-by: Greg Ungerer Signed-off-by: Linus Torvalds --- diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c index 151bd9ad3ab2..aad4012bbb30 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;