[LV-k25-commit] CVS: kernel-2.5/drivers/char dz.c,1.5,1.6 dz.h,1.2,1.3

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv19224/drivers/char

Modified Files:
	dz.c dz.h 
Log Message:
SERIAL_BH (and bottom halves in general) go away in 2.5.40.  Update DZ
driver accordingly.


Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dz.c	16 Feb 2003 01:05:23 -0000	1.5
+++ dz.c	19 Mar 2003 00:48:00 -0000	1.6
@@ -83,8 +83,6 @@
 
 #define DZ_INTR_DEBUG 1
 
-DECLARE_TASK_QUEUE(tq_serial);
-
 static struct dz_serial *lines[4];
 static unsigned char tmp_buffer[256];
 
@@ -197,8 +195,7 @@
 static inline void dz_sched_event (struct dz_serial *info, int event)
 {
 	info->event |= 1 << event;
-	queue_task(&info->tqueue, &tq_serial);
-	mark_bh(SERIAL_BH);
+	schedule_task(&info->tqueue);
 }
 
 /*
@@ -431,20 +428,6 @@
  * -------------------------------------------------------------------
  */
 
-/*
- * This routine is used to handle the "bottom half" processing for the
- * serial driver, known also the "software interrupt" processing.
- * This processing is done at the kernel interrupt level, after the
- * rs_interrupt() has returned, BUT WITH INTERRUPTS TURNED ON.  This
- * is where time-consuming activities which can not be done in the
- * interrupt driver proper are done; the interrupt driver schedules
- * them using rs_sched_event(), and they get done here.
- */
-static void do_serial_bh (void)
-{
-	run_task_queue (&tq_serial);
-}
-
 static void do_softint (void *private_data)
 {
 	struct dz_serial *info = (struct dz_serial *) private_data;
@@ -1373,9 +1356,6 @@
 #ifdef CONFIG_VAX
         int irq;
 #endif   
-	/* Setup base handler, and timer table. */
-	init_bh(SERIAL_BH, do_serial_bh);
-   
 	show_serial_version();
 
 	memset(&serial_driver, 0, sizeof(struct tty_driver));

Index: dz.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dz.h	20 May 2002 00:33:35 -0000	1.2
+++ dz.h	19 Mar 2003 00:48:00 -0000	1.3
@@ -168,8 +168,8 @@
 
   struct async_icount     icount;              /* keep track of things ... */
   struct tty_struct       *tty;                /* tty associated */
-  struct tq_struct        tqueue;              /* Queue for BH */
-  struct tq_struct        tqueue_hangup;
+  struct tq_struct        tqueue;
+  struct tq_struct        tqueue_hangup;       /* Seems to be no longer used */
   struct termios          normal_termios;
   struct termios          callout_termios;
   wait_queue_head_t       open_wait;
@@ -226,7 +226,6 @@
 #else
 static void dz_interrupt (int, void *, struct pt_regs *);
 #endif
-static void do_serial_bh (void);
 static void do_softint (void *);
 static void do_serial_hangup (void *);
 static void change_speed (struct dz_serial *);