Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
thorpej 2002-09-26 20:36:14 +00:00
parent 73a80999b7
commit 958db4d3b7
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/pmax/tc/mcclock_ioasic.c
View File

@ -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 @@ struct cfattach mcclock_ioasic_ca = {
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 @@ mcclock_ioasic_match(parent, match, aux)
{
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);

12
sys/arch/pmax/tc/scc.c
View File

@ -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 @@ sccmatch(parent, cf, aux)
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))