Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv8230/drivers/char
Modified Files:
dz.c dz.h
Log Message:
tqueue becomes workqueue, tq_struct becomes work_struct
Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dz.c 19 Mar 2003 00:48:00 -0000 1.6
+++ dz.c 21 Mar 2003 00:05:55 -0000 1.7
@@ -34,7 +34,7 @@
#include <linux/major.h>
#include <linux/delay.h>
#include <linux/param.h>
-#include <linux/tqueue.h>
+#include <linux/workqueue.h>
#include <linux/interrupt.h>
#include <linux/serial.h>
#include <linux/serialP.h>
@@ -195,7 +195,7 @@
static inline void dz_sched_event (struct dz_serial *info, int event)
{
info->event |= 1 << event;
- schedule_task(&info->tqueue);
+ schedule_work(&info->tqueue);
}
/*
@@ -1441,10 +1441,8 @@
info->event = 0;
info->count = 0;
info->blocked_open = 0;
- info->tqueue.routine = do_softint;
- info->tqueue.data = info;
- info->tqueue_hangup.routine = do_serial_hangup;
- info->tqueue_hangup.data = info;
+ INIT_WORK(&info->tqueue, do_softint, info);
+ INIT_WORK(&info->tqueue_hangup, do_serial_hangup, info);
info->callout_termios = callout_driver.init_termios;
info->normal_termios = serial_driver.init_termios;
init_waitqueue_head(&info->open_wait);
Index: dz.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dz.h 19 Mar 2003 00:48:00 -0000 1.3
+++ dz.h 21 Mar 2003 00:05:55 -0000 1.4
@@ -168,8 +168,8 @@
struct async_icount icount; /* keep track of things ... */
struct tty_struct *tty; /* tty associated */
- struct tq_struct tqueue;
- struct tq_struct tqueue_hangup; /* Seems to be no longer used */
+ struct work_struct tqueue;
+ struct work_struct tqueue_hangup; /* Seems to be no longer used */
struct termios normal_termios;
struct termios callout_termios;
wait_queue_head_t open_wait;
|
