[src/trunk]: src/sys/arch/arm26 Remove ioc_irq_establish -- It wasn't serving...

[bjh21 <bjh21%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d19055595c1a
branches:  trunk
changeset: 501791:d19055595c1a
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Sun Jan 07 15:36:34 2001 +0000

description:
Remove ioc_irq_establish -- It wasn't serving any useful purpose.

diffstat:

 sys/arch/arm26/iobus/ioc.c     |  25 ++++++-------------------
 sys/arch/arm26/iobus/iocvar.h  |   4 +---
 sys/arch/arm26/ioc/arckbd.c    |  10 ++++------
 sys/arch/arm26/vidc/arcvideo.c |   6 +++---
 4 files changed, 14 insertions(+), 31 deletions(-)

diffs (138 lines):

diff -r fc841c957b4c -r d19055595c1a sys/arch/arm26/iobus/ioc.c
--- a/sys/arch/arm26/iobus/ioc.c        Sun Jan 07 15:27:37 2001 +0000
+++ b/sys/arch/arm26/iobus/ioc.c        Sun Jan 07 15:36:34 2001 +0000
@@ -1,4 +1,5 @@
-/* $NetBSD: ioc.c,v 1.5 2001/01/07 14:28:02 bjh21 Exp $ */
+/* $NetBSD: ioc.c,v 1.6 2001/01/07 15:36:34 bjh21 Exp $ */
+
 /*-
  * Copyright (c) 1998, 1999, 2000 Ben Harris
  * All rights reserved.
@@ -32,7 +33,7 @@
 
 #include <sys/param.h>
 
-__RCSID("$NetBSD: ioc.c,v 1.5 2001/01/07 14:28:02 bjh21 Exp $");
+__RCSID("$NetBSD: ioc.c,v 1.6 2001/01/07 15:36:34 bjh21 Exp $");
 
 #include <sys/device.h>
 #include <sys/kernel.h>
@@ -221,19 +222,6 @@
 }
 
 /*
- * Interrupt handling
- */
-
-struct irq_handler *
-ioc_irq_establish(struct device *self, int irq, int level,
-    int (*handler)(void *), void *cookie)
-{
-       /* struct ioc_softc *sc = (void *)self; */
-
-       return irq_establish(irq, level, handler, cookie);
-}
-
-/*
  * Find out if an interrupt line is currently active
  */
 
@@ -373,16 +361,15 @@
            (t0_count = IOC_TIMER_RATE / hz) > 65535)
                panic("ioc_initclocks: Impossible clock rate: %d Hz", hz);
        ioc_counter_start(self, 0, t0_count);
-       sc->sc_clkirq = ioc_irq_establish(self, IOC_IRQ_TM0, IPL_CLOCK,
-                                         ioc_irq_clock, NULL);
+       sc->sc_clkirq = irq_establish(IOC_IRQ_TM0, IPL_CLOCK, ioc_irq_clock,
+           NULL);
        if (bootverbose)
                printf("%s: %d Hz clock interrupting at %s\n",
                    self->dv_xname, hz, irq_string(sc->sc_clkirq));
        
        if (stathz) {
                setstatclockrate(stathz);
-               sc->sc_sclkirq = ioc_irq_establish(self, IOC_IRQ_TM1,
-                                                  IPL_STATCLOCK,
+               sc->sc_sclkirq = irq_establish(IOC_IRQ_TM1, IPL_STATCLOCK,
                                                   ioc_irq_statclock, NULL);
                if (bootverbose)
                        printf("%s: %d Hz statclock interrupting at %s\n",
diff -r fc841c957b4c -r d19055595c1a sys/arch/arm26/iobus/iocvar.h
--- a/sys/arch/arm26/iobus/iocvar.h     Sun Jan 07 15:27:37 2001 +0000
+++ b/sys/arch/arm26/iobus/iocvar.h     Sun Jan 07 15:36:34 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iocvar.h,v 1.2 2001/01/07 13:48:24 bjh21 Exp $ */
+/* $NetBSD: iocvar.h,v 1.3 2001/01/07 15:36:34 bjh21 Exp $ */
 /*-
  * Copyright (c) 1998, 1999 Ben Harris
  * All rights reserved.
@@ -56,8 +56,6 @@
 extern u_int ioc_ctl_read(struct device *);
 extern void ioc_ctl_write(struct device *, u_int, u_int);
 
-extern struct irq_handler *ioc_irq_establish(struct device *, int, int,
-    int(*)(void *), void *);
 extern int ioc_irq_status(struct device *, int);
 extern void ioc_irq_waitfor(struct device *, int);
 extern void ioc_irq_clear(struct device *, int);
diff -r fc841c957b4c -r d19055595c1a sys/arch/arm26/ioc/arckbd.c
--- a/sys/arch/arm26/ioc/arckbd.c       Sun Jan 07 15:27:37 2001 +0000
+++ b/sys/arch/arm26/ioc/arckbd.c       Sun Jan 07 15:36:34 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arckbd.c,v 1.6 2001/01/07 15:00:02 bjh21 Exp $ */
+/* $NetBSD: arckbd.c,v 1.7 2001/01/07 15:36:35 bjh21 Exp $ */
 /*-
  * Copyright (c) 1998, 1999, 2000 Ben Harris
  * All rights reserved.
@@ -43,7 +43,7 @@
 
 #include <sys/param.h>
 
-__RCSID("$NetBSD: arckbd.c,v 1.6 2001/01/07 15:00:02 bjh21 Exp $");
+__RCSID("$NetBSD: arckbd.c,v 1.7 2001/01/07 15:36:35 bjh21 Exp $");
 
 #include <sys/device.h>
 #include <sys/errno.h>
@@ -203,13 +203,11 @@
        bst = sc->sc_bst = ioc->ioc_fast_t;
        bsh = sc->sc_bsh = ioc->ioc_fast_h; 
 
-       sc->sc_rirq = ioc_irq_establish(sc->sc_dev.dv_parent, IOC_IRQ_SRX,
-                                       IPL_TTY, arckbd_rint, self);
+       sc->sc_rirq = irq_establish(IOC_IRQ_SRX, IPL_TTY, arckbd_rint, self);
        if (bootverbose)
                printf("\n%s: interrupting at %s (rx)", self->dv_xname,
                    irq_string(sc->sc_rirq));
-       sc->sc_xirq = ioc_irq_establish(sc->sc_dev.dv_parent, IOC_IRQ_STX,
-                                       IPL_TTY, arckbd_xint, self);
+       sc->sc_xirq = irq_establish(IOC_IRQ_STX, IPL_TTY, arckbd_xint, self);
        irq_disable(sc->sc_xirq);
        if (bootverbose)
                printf(" and %s (tx)", irq_string(sc->sc_xirq));
diff -r fc841c957b4c -r d19055595c1a sys/arch/arm26/vidc/arcvideo.c
--- a/sys/arch/arm26/vidc/arcvideo.c    Sun Jan 07 15:27:37 2001 +0000
+++ b/sys/arch/arm26/vidc/arcvideo.c    Sun Jan 07 15:36:34 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arcvideo.c,v 1.7 2001/01/07 15:27:37 bjh21 Exp $ */
+/* $NetBSD: arcvideo.c,v 1.8 2001/01/07 15:36:35 bjh21 Exp $ */
 /*-
  * Copyright (c) 1998, 2000 Ben Harris
  * All rights reserved.
@@ -39,7 +39,7 @@
 
 #include <sys/param.h>
 
-__RCSID("$NetBSD: arcvideo.c,v 1.7 2001/01/07 15:27:37 bjh21 Exp $");
+__RCSID("$NetBSD: arcvideo.c,v 1.8 2001/01/07 15:36:35 bjh21 Exp $");
 
 #include <sys/device.h>
 #include <sys/errno.h>
@@ -157,7 +157,7 @@
        if (ioc_cd.cd_ndevs > 0 && ioc_cd.cd_devs[0] != NULL) {
                /* ioc0 exists */
                sc->sc_ioc = ioc_cd.cd_devs[0];
-               sc->sc_irq = ioc_irq_establish(sc->sc_ioc, IOC_IRQ_IR, IPL_TTY,
+               sc->sc_irq = irq_establish(IOC_IRQ_IR, IPL_TTY,
                                               arcvideo_intr, self);
                if (bootverbose)
                        printf(": VSYNC interrupts at %s",