summaryrefslogtreecommitdiff
path: root/sys/dev/tc
diff options
context:
space:
mode:
authordrochner <drochner@NetBSD.org>2005-08-26 10:13:05 +0000
committerdrochner <drochner@NetBSD.org>2005-08-26 10:13:05 +0000
commit096c3e1d2cd40ee92fc61e73df2e59325cb1f340 (patch)
treee67f1a261e1f388b972b23c6867e485719b13aff /sys/dev/tc
parent3879a2028911a77097c628bb848dc541ae31ebdd (diff)
kill some more simple submatch() functions, use config_stdsubmatch()
Diffstat (limited to 'sys/dev/tc')
-rw-r--r--sys/dev/tc/ioasic_subr.c20
-rw-r--r--sys/dev/tc/tc.c28
-rw-r--r--sys/dev/tc/tcds.c23
3 files changed, 10 insertions, 61 deletions
diff --git a/sys/dev/tc/ioasic_subr.c b/sys/dev/tc/ioasic_subr.c
index 1d4b2d9bd90..fc550d5b05d 100644
--- a/sys/dev/tc/ioasic_subr.c
+++ b/sys/dev/tc/ioasic_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ioasic_subr.c,v 1.9 2005/08/25 18:35:40 drochner Exp $ */
+/* $NetBSD: ioasic_subr.c,v 1.10 2005/08/26 10:14:05 drochner Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioasic_subr.c,v 1.9 2005/08/25 18:35:40 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioasic_subr.c,v 1.10 2005/08/26 10:14:05 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,8 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: ioasic_subr.c,v 1.9 2005/08/25 18:35:40 drochner Exp
#include "locators.h"
int ioasicprint(void *, const char *);
-int ioasicsubmatch(struct device *, struct cfdata *,
- const locdesc_t *, void *);
int
ioasicprint(aux, pnp)
@@ -56,18 +54,6 @@ ioasicprint(aux, pnp)
return (UNCONF);
}
-int
-ioasicsubmatch(struct device *parent, struct cfdata *cf,
- const locdesc_t *locs, void *aux)
-{
-
- if ((cf->cf_loc[IOASICCF_OFFSET] != IOASICCF_OFFSET_DEFAULT) &&
- (cf->cf_loc[IOASICCF_OFFSET] != locs[IOASICCF_OFFSET]))
- return (0);
-
- return (config_match(parent, cf, aux));
-}
-
void
ioasic_attach_devs(sc, ioasic_devs, ioasic_ndevs)
struct ioasic_softc *sc;
@@ -91,6 +77,6 @@ ioasic_attach_devs(sc, ioasic_devs, ioasic_ndevs)
/* Tell the autoconfig machinery we've found the hardware. */
locs[IOASICCF_OFFSET] = ioasic_devs[i].iad_offset;
config_found_sm_loc(&sc->sc_dv, "ioasic", locs, &idev,
- ioasicprint, ioasicsubmatch);
+ ioasicprint, config_stdsubmatch);
}
}
diff --git a/sys/dev/tc/tc.c b/sys/dev/tc/tc.c
index c29572a356d..620c3169a0b 100644
--- a/sys/dev/tc/tc.c
+++ b/sys/dev/tc/tc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tc.c,v 1.41 2005/08/25 18:35:40 drochner Exp $ */
+/* $NetBSD: tc.c,v 1.42 2005/08/26 10:14:05 drochner Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.41 2005/08/25 18:35:40 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.42 2005/08/26 10:14:05 drochner Exp $");
#include "opt_tcverbose.h"
@@ -51,8 +51,6 @@ CFATTACH_DECL(tc, sizeof(struct tc_softc),
extern struct cfdriver tc_cd;
int tcprint(void *, const char *);
-int tcsubmatch(struct device *, struct cfdata *,
- const locdesc_t *, void *);
void tc_devinfo(const char *, char *, size_t);
int
@@ -141,7 +139,7 @@ tcattach(parent, self, aux)
* Attach the device.
*/
config_found_sm_loc(self, "tc", locs, &ta,
- tcprint, tcsubmatch);
+ tcprint, config_stdsubmatch);
}
/*
@@ -184,7 +182,7 @@ tcattach(parent, self, aux)
* Attach the device.
*/
config_found_sm_loc(self, "tc", locs, &ta,
- tcprint, tcsubmatch);
+ tcprint, config_stdsubmatch);
}
}
@@ -204,24 +202,6 @@ tcprint(aux, pnp)
return (UNCONF);
}
-int
-tcsubmatch(parent, cf, locs, aux)
- struct device *parent;
- struct cfdata *cf;
- const locdesc_t *locs;
- void *aux;
-{
-
- if ((cf->cf_loc[TCCF_SLOT] != TCCF_SLOT_DEFAULT) &&
- (cf->cf_loc[TCCF_SLOT] != locs[TCCF_SLOT]))
- return 0;
- if ((cf->cf_loc[TCCF_OFFSET] != TCCF_OFFSET_DEFAULT) &&
- (cf->cf_loc[TCCF_OFFSET] != locs[TCCF_OFFSET]))
- return 0;
-
- return (config_match(parent, cf, aux));
-}
-
#define NTC_ROMOFFS 2
static tc_offset_t tc_slot_romoffs[NTC_ROMOFFS] = {
diff --git a/sys/dev/tc/tcds.c b/sys/dev/tc/tcds.c
index 04caf2e434f..73fa6739129 100644
--- a/sys/dev/tc/tcds.c
+++ b/sys/dev/tc/tcds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcds.c,v 1.15 2005/08/25 18:35:40 drochner Exp $ */
+/* $NetBSD: tcds.c,v 1.16 2005/08/26 10:14:05 drochner Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.15 2005/08/25 18:35:40 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.16 2005/08/26 10:14:05 drochner Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -109,8 +109,6 @@ struct tcds_softc {
int tcdsmatch(struct device *, struct cfdata *, void *);
void tcdsattach(struct device *, struct device *, void *);
int tcdsprint(void *, const char *);
-int tcdssubmatch(struct device *, struct cfdata *,
- const locdesc_t *, void *);
CFATTACH_DECL(tcds, sizeof(struct tcds_softc),
tcdsmatch, tcdsattach, NULL, NULL);
@@ -310,7 +308,7 @@ tcdsattach(parent, self, aux)
locs[TCDSCF_CHIP] = i;
config_found_sm_loc(self, "tcds", locs, &tcdsdev,
- tcdsprint, tcdssubmatch);
+ tcdsprint, config_stdsubmatch);
#ifdef __alpha__
/*
* The second SCSI chip isn't present on the baseboard TCDS
@@ -324,21 +322,6 @@ tcdsattach(parent, self, aux)
}
int
-tcdssubmatch(parent, cf, locs, aux)
- struct device *parent;
- struct cfdata *cf;
- const locdesc_t *locs;
- void *aux;
-{
-
- if (cf->cf_loc[TCDSCF_CHIP] != TCDSCF_CHIP_DEFAULT &&
- cf->cf_loc[TCDSCF_CHIP] != locs[TCDSCF_CHIP])
- return (0);
-
- return (config_match(parent, cf, aux));
-}
-
-int
tcdsprint(aux, pnp)
void *aux;
const char *pnp;