Commit 28580df0 authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds
Browse files

[PATCH] m68knommu: fix work queues in mcfserial.c driver 



Fix work queue code to support new model.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ebfcfef4

drivers/serial/mcfserial.c

+14 −19
Original line number Diff line number Diff line
@@ -425,14 +425,12 @@ irqreturn_t mcfrs_interrupt(int irq, void *dev_id) 
 * -------------------------------------------------------------------

 */



static void mcfrs_offintr(void *private)

static void mcfrs_offintr(struct work_struct *work)

{

	struct mcf_serial	*info = (struct mcf_serial *) private;

	struct tty_struct	*tty;

	struct mcf_serial *info = container_of(work, struct mcf_serial, tqueue);

	struct tty_struct *tty = info->tty;

	

	tty = info->tty;

	if (!tty)

		return;

	if (tty)

		tty_wakeup(tty);

}
@@ -497,15 +495,12 @@ static void mcfrs_timer(void) 
 * 	do_serial_hangup() -> tty->hangup() -> mcfrs_hangup()

 * 

 */

static void do_serial_hangup(void *private)

static void do_serial_hangup(struct work_struct *work)

{

	struct mcf_serial	*info = (struct mcf_serial *) private;

	struct tty_struct	*tty;

	

	tty = info->tty;

	if (!tty)

		return;

	struct mcf_serial *info = container_of(work, struct mcf_serial, tqueue_hangup);

	struct tty_struct *tty = info->tty;

	

	if (tty)

		tty_hangup(tty);

}
@@ -857,7 +852,7 @@ static void mcfrs_throttle(struct tty_struct * tty) 
#ifdef SERIAL_DEBUG_THROTTLE

	char	buf[64];

	

	printk("throttle %s: %d....\n", _tty_name(tty, buf),

	printk("throttle %s: %d....\n", tty_name(tty, buf),

	       tty->ldisc.chars_in_buffer(tty));

#endif
@@ -876,7 +871,7 @@ static void mcfrs_unthrottle(struct tty_struct * tty) 
#ifdef SERIAL_DEBUG_THROTTLE

	char	buf[64];

	

	printk("unthrottle %s: %d....\n", _tty_name(tty, buf),

	printk("unthrottle %s: %d....\n", tty_name(tty, buf),

	       tty->ldisc.chars_in_buffer(tty));

#endif
@@ -1790,8 +1785,8 @@ mcfrs_init(void) 
		info->event = 0;

		info->count = 0;

		info->blocked_open = 0;

		INIT_WORK(&info->tqueue, mcfrs_offintr, info);

		INIT_WORK(&info->tqueue_hangup, do_serial_hangup, info);

		INIT_WORK(&info->tqueue, mcfrs_offintr);

		INIT_WORK(&info->tqueue_hangup, do_serial_hangup);

		init_waitqueue_head(&info->open_wait);

		init_waitqueue_head(&info->close_wait);