[src/trunk]: src/sys/arch/pmax/tc No need to check that parent's cfdriver is ...

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

details:   https://anonhg.NetBSD.org/src/rev/af9e2d68470d
branches:  trunk
changeset: 537094:af9e2d68470d
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Sep 26 20:36:14 2002 +0000

description:
No need to check that parent's cfdriver is ioasic_cd.

diffstat:

 sys/arch/pmax/tc/mcclock_ioasic.c |   9 ++-------
 sys/arch/pmax/tc/scc.c            |  12 ++----------
 2 files changed, 4 insertions(+), 17 deletions(-)

diffs (73 lines):

diff -r b8fccb4582a3 -r af9e2d68470d sys/arch/pmax/tc/mcclock_ioasic.c
--- a/sys/arch/pmax/tc/mcclock_ioasic.c Thu Sep 26 20:35:56 2002 +0000
+++ b/sys/arch/pmax/tc/mcclock_ioasic.c Thu Sep 26 20:36:14 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mcclock_ioasic.c,v 1.15 2002/01/08 17:10:28 chs Exp $ */
+/*     $NetBSD: mcclock_ioasic.c,v 1.16 2002/09/26 20:36:14 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock_ioasic.c,v 1.15 2002/01/08 17:10:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_ioasic.c,v 1.16 2002/09/26 20:36:14 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -49,8 +49,6 @@
        sizeof (struct mcclock_pad32_softc),
        mcclock_ioasic_match, mcclock_ioasic_attach, 
 };
-extern struct cfdriver ioasic_cd;
-
 
 static int
 mcclock_ioasic_match(parent, match, aux)
@@ -60,9 +58,6 @@
 {
        struct ioasicdev_attach_args *d = aux;
 
-       if (parent->dv_cfdata->cf_driver != &ioasic_cd)
-               return 0;
-
        if (strcmp("mc146818", d->iada_modname) != 0)
                return (0);
 
diff -r b8fccb4582a3 -r af9e2d68470d sys/arch/pmax/tc/scc.c
--- a/sys/arch/pmax/tc/scc.c    Thu Sep 26 20:35:56 2002 +0000
+++ b/sys/arch/pmax/tc/scc.c    Thu Sep 26 20:36:14 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scc.c,v 1.72 2002/09/06 13:18:43 gehenna Exp $ */
+/*     $NetBSD: scc.c,v 1.73 2002/09/26 20:36:14 thorpej Exp $ */
 
 /*
  * Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.72 2002/09/06 13:18:43 gehenna Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.73 2002/09/26 20:36:14 thorpej Exp $");
 
 /*
  * Intel 82530 dual usart chip driver. Supports the serial port(s) on the
@@ -334,17 +334,9 @@
        struct cfdata *cf;
        void *aux;
 {
-       extern struct cfdriver ioasic_cd;               /* XXX */
        struct ioasicdev_attach_args *d = aux;
        void *sccaddr;
 
-       if (parent->dv_cfdata->cf_driver != &ioasic_cd) {
-#ifdef DIAGNOSTIC
-               printf("Cannot attach scc on %s\n", parent->dv_xname);
-#endif
-               return (0);
-       }
-
        /* Make sure that we're looking for this type of device. */
        if ((strncmp(d->iada_modname, "z8530   ", TC_ROM_LLEN) != 0) &&
            (strncmp(d->iada_modname, "scc", TC_ROM_LLEN)!= 0))