Get rid of specific softc structure for pci host bridges, as it is never

used. No functional change.

10 files changed, 19 insertions, 51 deletions

diff --git a/sys/arch/alpha/pci/apecs.c b/sys/arch/alpha/pci/apecs.c
index dba64eae71e..5f117a980a0 100644
--- a/sys/arch/alpha/pci/apecs.c
+++ b/sys/arch/alpha/pci/apecs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apecs.c,v 1.18 2006/03/13 20:10:49 brad Exp $	*/
+/*	$OpenBSD: apecs.c,v 1.19 2006/03/16 22:32:44 miod Exp $	*/
 /*	$NetBSD: apecs.c,v 1.16 1996/12/05 01:39:34 cgd Exp $	*/
 
 /*-
@@ -98,7 +98,7 @@ int	apecsmatch(struct device *, void *, void *);
 void	apecsattach(struct device *, struct device *, void *);
 
 struct cfattach apecs_ca = {
-	sizeof(struct apecs_softc), apecsmatch, apecsattach,
+	sizeof(struct device), apecsmatch, apecsattach,
 };
 
 struct cfdriver apecs_cd = {
@@ -180,7 +180,6 @@ apecsattach(parent, self, aux)
 	struct device *parent, *self;
 	void *aux;
 {
-	struct apecs_softc *sc = (struct apecs_softc *)self;
 	struct apecs_config *acp;
 	struct pcibus_attach_args pba;
 
@@ -191,7 +190,7 @@ apecsattach(parent, self, aux)
 	 * set up the chipset's info; done once at console init time
 	 * (maybe), but doesn't hurt to do twice.
 	 */
-	acp = sc->sc_acp = &apecs_configuration;
+	acp = &apecs_configuration;
 	apecs_init(acp, 1);
 
 	apecs_dma_init(acp);
diff --git a/sys/arch/alpha/pci/apecsvar.h b/sys/arch/alpha/pci/apecsvar.h
index ef512550fd4..5256a8d09ea 100644
--- a/sys/arch/alpha/pci/apecsvar.h
+++ b/sys/arch/alpha/pci/apecsvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apecsvar.h,v 1.9 2002/03/14 01:26:27 millert Exp $	*/
+/*	$OpenBSD: apecsvar.h,v 1.10 2006/03/16 22:32:44 miod Exp $	*/
 /*	$NetBSD: apecsvar.h,v 1.5 1996/11/25 03:49:36 cgd Exp $	*/
 
 /*
@@ -59,12 +59,6 @@ struct apecs_config {
 	int	ac_mallocsafe;
 };
 
-struct apecs_softc {
-	struct	device sc_dev;
-
-	struct	apecs_config *sc_acp;
-};
-
 void	apecs_init(struct apecs_config *, int);
 void	apecs_pci_init(pci_chipset_tag_t, void *);
 void	apecs_dma_init(struct apecs_config *);
diff --git a/sys/arch/alpha/pci/cia.c b/sys/arch/alpha/pci/cia.c
index 87623a2e941..8ebaddc86ae 100644
--- a/sys/arch/alpha/pci/cia.c
+++ b/sys/arch/alpha/pci/cia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia.c,v 1.21 2006/03/13 20:10:49 brad Exp $ */
+/* $OpenBSD: cia.c,v 1.22 2006/03/16 22:32:44 miod Exp $ */
 /* $NetBSD: cia.c,v 1.56 2000/06/29 08:58:45 mrg Exp $ */
 
 /*-
@@ -103,7 +103,7 @@ int	ciamatch(struct device *, void *, void *);
 void	ciaattach(struct device *, struct device *, void *);
 
 struct cfattach cia_ca = {
-	sizeof(struct cia_softc), ciamatch, ciaattach,
+	sizeof(struct device), ciamatch, ciaattach,
 };
 
 struct cfdriver cia_cd = {
@@ -268,7 +268,6 @@ ciaattach(parent, self, aux)
 	struct device *parent, *self;
 	void *aux;
 {
-	struct cia_softc *sc = (struct cia_softc *)self;
 	struct cia_config *ccp;
 	struct pcibus_attach_args pba;
 	const char *name;
@@ -282,7 +281,7 @@ ciaattach(parent, self, aux)
 	 * (maybe), but we must do it here as well to take care of things
 	 * that need to use memory allocation.
 	 */
-	ccp = sc->sc_ccp = &cia_configuration;
+	ccp = &cia_configuration;
 	cia_init(ccp, 1);
 
 	if (ccp->cc_flags & CCF_ISPYXIS) {
diff --git a/sys/arch/alpha/pci/ciavar.h b/sys/arch/alpha/pci/ciavar.h
index 419bc4d8d06..017b10b8162 100644
--- a/sys/arch/alpha/pci/ciavar.h
+++ b/sys/arch/alpha/pci/ciavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ciavar.h,v 1.12 2002/03/14 01:26:27 millert Exp $ */
+/* $OpenBSD: ciavar.h,v 1.13 2006/03/16 22:32:44 miod Exp $ */
 /* $NetBSD: ciavar.h,v 1.17 2000/03/19 01:43:25 thorpej Exp $ */
 
 /*
@@ -66,12 +66,6 @@ struct cia_config {
 	int	cc_mallocsafe;
 };
 
-struct cia_softc {
-	struct	device sc_dev;
-
-	struct	cia_config *sc_ccp;
-};
-
 void	cia_init(struct cia_config *, int);
 void	cia_pci_init(pci_chipset_tag_t, void *);
 void	cia_dma_init(struct cia_config *);
diff --git a/sys/arch/alpha/pci/irongate.c b/sys/arch/alpha/pci/irongate.c
index bca9c006616..233dcb3b374 100644
--- a/sys/arch/alpha/pci/irongate.c
+++ b/sys/arch/alpha/pci/irongate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: irongate.c,v 1.7 2006/03/13 20:10:49 brad Exp $	*/
+/*	$OpenBSD: irongate.c,v 1.8 2006/03/16 22:32:44 miod Exp $	*/
 /* $NetBSD: irongate.c,v 1.3 2000/11/29 06:29:10 thorpej Exp $ */
 
 /*-
@@ -61,7 +61,7 @@ int	irongate_match(struct device *, void *, void *);
 void	irongate_attach(struct device *, struct device *, void *);
 
 struct cfattach irongate_ca = {
-	sizeof(struct irongate_softc), irongate_match, irongate_attach,
+	sizeof(struct device), irongate_match, irongate_attach,
 };
 
 int	irongate_print(void *, const char *pnp);
@@ -142,7 +142,6 @@ irongate_match(struct device *parent, void *match, void *aux)
 void
 irongate_attach(struct device *parent, struct device *self, void *aux)
 {
-	struct irongate_softc *sc = (void *) self;
 	struct irongate_config *icp;
 	struct pcibus_attach_args pba;
 
@@ -154,7 +153,7 @@ irongate_attach(struct device *parent, struct device *self, void *aux)
 	 * (maybe), but we must do it here as well to take care of things
 	 * that need to use memory allocation.
 	 */
-	icp = sc->sc_icp = &irongate_configuration;
+	icp = &irongate_configuration;
 	irongate_init(icp, 1);
 
 	printf(": rev. %d\n", icp->ic_rev);
diff --git a/sys/arch/alpha/pci/irongatevar.h b/sys/arch/alpha/pci/irongatevar.h
index 62180eb3433..a6e19edc120 100644
--- a/sys/arch/alpha/pci/irongatevar.h
+++ b/sys/arch/alpha/pci/irongatevar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: irongatevar.h,v 1.3 2001/12/14 00:44:59 nate Exp $	*/
+/*	$OpenBSD: irongatevar.h,v 1.4 2006/03/16 22:32:44 miod Exp $	*/
 /* $NetBSD: irongatevar.h,v 1.3 2000/11/29 06:29:10 thorpej Exp $ */
 
 /*-
@@ -61,12 +61,6 @@ struct irongate_config {
 	int	ic_mallocsafe;
 };
 
-struct irongate_softc {
-	struct	device sc_dev;
-
-	struct	irongate_config *sc_icp;
-};
-
 void	irongate_init(struct irongate_config *, int);
 void	irongate_pci_init(pci_chipset_tag_t, void *);
 void	irongate_dma_init(struct irongate_config *);
diff --git a/sys/arch/alpha/pci/lca.c b/sys/arch/alpha/pci/lca.c
index a90c5f92007..3ec9a253179 100644
--- a/sys/arch/alpha/pci/lca.c
+++ b/sys/arch/alpha/pci/lca.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lca.c,v 1.17 2006/03/13 20:10:49 brad Exp $	*/
+/*	$OpenBSD: lca.c,v 1.18 2006/03/16 22:32:44 miod Exp $	*/
 /*	$NetBSD: lca.c,v 1.14 1996/12/05 01:39:35 cgd Exp $	*/
 
 /*-
@@ -96,7 +96,7 @@ int	lcamatch(struct device *, void *, void *);
 void	lcaattach(struct device *, struct device *, void *);
 
 struct cfattach lca_ca = {
-	sizeof(struct lca_softc), lcamatch, lcaattach,
+	sizeof(struct device), lcamatch, lcaattach,
 };
 
 struct cfdriver lca_cd = {
@@ -207,7 +207,6 @@ lcaattach(parent, self, aux)
 	struct device *parent, *self;
 	void *aux;
 {
-	struct lca_softc *sc = (struct lca_softc *)self;
 	struct lca_config *lcp;
 	struct pcibus_attach_args pba;
 
@@ -220,7 +219,7 @@ lcaattach(parent, self, aux)
 	 * (maybe), but we must do it twice to take care of things
 	 * that need to use memory allocation.
 	 */
-	lcp = sc->sc_lcp = &lca_configuration;
+	lcp = &lca_configuration;
 	lca_init(lcp, 1);
 
 	/* XXX print chipset information */
diff --git a/sys/arch/alpha/pci/lcavar.h b/sys/arch/alpha/pci/lcavar.h
index 8a25348d6b9..808f52d9c4d 100644
--- a/sys/arch/alpha/pci/lcavar.h
+++ b/sys/arch/alpha/pci/lcavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcavar.h,v 1.10 2002/03/14 01:26:27 millert Exp $	*/
+/*	$OpenBSD: lcavar.h,v 1.11 2006/03/16 22:32:44 miod Exp $	*/
 /* $NetBSD: lcavar.h,v 1.7 1997/06/06 23:54:32 thorpej Exp $ */
 
 /*
@@ -55,12 +55,6 @@ struct lca_config {
 	int	lc_mallocsafe;
 };
 
-struct lca_softc {
-	struct	device sc_dev;
-
-	struct	lca_config *sc_lcp;
-};
-
 void	lca_init(struct lca_config *, int);
 void	lca_pci_init(pci_chipset_tag_t, void *);
 void	lca_dma_init(struct lca_config *);
diff --git a/sys/arch/alpha/pci/tsc.c b/sys/arch/alpha/pci/tsc.c
index 29807f4af7b..2acb1c49210 100644
--- a/sys/arch/alpha/pci/tsc.c
+++ b/sys/arch/alpha/pci/tsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsc.c,v 1.11 2006/03/13 20:10:49 brad Exp $ */
+/* $OpenBSD: tsc.c,v 1.12 2006/03/16 22:32:44 miod Exp $ */
 /* $NetBSD: tsc.c,v 1.3 2000/06/25 19:17:40 thorpej Exp $ */
 
 /*-
@@ -57,7 +57,7 @@ int	tscmatch(struct device *, void *, void *);
 void	tscattach(struct device *, struct device *, void *);
 
 struct cfattach tsc_ca = {
-	sizeof(struct tsc_softc), tscmatch, tscattach,
+	sizeof(struct device), tscmatch, tscattach,
 };
 
 struct cfdriver tsc_cd = {
diff --git a/sys/arch/alpha/pci/tsvar.h b/sys/arch/alpha/pci/tsvar.h
index 057163157ef..1bf315af943 100644
--- a/sys/arch/alpha/pci/tsvar.h
+++ b/sys/arch/alpha/pci/tsvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsvar.h,v 1.5 2003/09/02 17:25:21 miod Exp $ */
+/* $OpenBSD: tsvar.h,v 1.6 2006/03/16 22:32:44 miod Exp $ */
 /* $NetBSD: tsvar.h,v 1.1 1999/06/29 06:46:47 ross Exp $ */
 
 /*-
@@ -38,10 +38,6 @@
 
 #define	tsvar() { Generate ctags(1) key. }
 
-struct tsc_softc {
-	struct	device tsc_dev;
-};
-
 struct tsp_config {
 	int	pc_pslot;		/* Pchip 0 or 1 */
 	int	pc_initted;		/* Initialized */