From 2914c993e3c8c9d92ebfdb29cfd26194dc9c4d54 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Wed, 25 Jul 2007 22:07:20 +1000 Subject: [PATCH] --- yaml --- r: 62881 b: refs/heads/master c: 931f9cde5c3f9dc7827759db258eaf979bfa92b6 h: refs/heads/master i: 62879: 9f8b589f405bfd23c812294d9f8383d8e67803bc v: v3 --- [refs] | 2 +- trunk/drivers/serial/68328serial.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a9987795ea0f..048e552615ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a427138712f388987aa13475bf591685b6b8cd46 +refs/heads/master: 931f9cde5c3f9dc7827759db258eaf979bfa92b6 diff --git a/trunk/drivers/serial/68328serial.c b/trunk/drivers/serial/68328serial.c index 151bd9ad3ab2..aad4012bbb30 100644 --- a/trunk/drivers/serial/68328serial.c +++ b/trunk/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;