Remove some useless variables/code dealing with cardbus BARs

reprogramming.

ok mglocker@

3 files changed, 8 insertions, 21 deletions

diff --git a/sys/dev/pci/if_acx_pci.c b/sys/dev/pci/if_acx_pci.c
index ec78470d47d..b7219278f90 100644
--- a/sys/dev/pci/if_acx_pci.c
+++ b/sys/dev/pci/if_acx_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_acx_pci.c,v 1.5 2006/11/10 20:20:04 damien Exp $  */
+/*	$OpenBSD: if_acx_pci.c,v 1.6 2006/11/18 20:44:40 grange Exp $  */
 
 /*-
  * Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org>
@@ -64,9 +64,6 @@ struct acx_pci_softc {
 	void			*sc_ih;
 	bus_size_t		sc_mapsize1;
 	bus_size_t		sc_mapsize2;
-	pcireg_t		sc_iobar_val; /* acx100 only */
-	pcireg_t		sc_bar1_val;
-	pcireg_t		sc_bar2_val;
 	int			sc_intrline;
 
 	/* hack for ACX100A */
@@ -109,7 +106,6 @@ acx_pci_attach(struct device *parent, struct device *self, void *aux)
 	struct acx_softc *sc = &psc->sc_acx;
 	struct pci_attach_args *pa = aux;
 	const char *intrstr = NULL;
-	bus_addr_t base;
 	pci_intr_handle_t ih;
 	int error, b1 = ACX_PCI_BAR0, b2 = ACX_PCI_BAR1;
 
@@ -120,36 +116,31 @@ acx_pci_attach(struct device *parent, struct device *self, void *aux)
 	if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_TI_ACX100A) {
 		error = pci_mapreg_map(pa, ACX_PCI_BAR0,
 		    PCI_MAPREG_TYPE_IO, 0, &psc->sc_io_bt,
-		    &psc->sc_io_bh, &base, &psc->sc_iomapsize, 0);
+		    &psc->sc_io_bh, NULL, &psc->sc_iomapsize, 0);
 		if (error != 0) {
 			printf(": could not map i/o space\n");
 			return;
 		}
-		psc->sc_iobar_val = base | PCI_MAPREG_TYPE_IO;
 		b1 = ACX_PCI_BAR1;
 		b2 = ACX_PCI_BAR2;
 	}
 
 	error = pci_mapreg_map(pa, b1, PCI_MAPREG_TYPE_MEM |
 	    PCI_MAPREG_MEM_TYPE_32BIT, 0, &sc->sc_mem1_bt,
-	    &sc->sc_mem1_bh, &base, &psc->sc_mapsize1, 0);
+	    &sc->sc_mem1_bh, NULL, &psc->sc_mapsize1, 0);
 	if (error != 0) {
 		printf(": could not map memory1 space\n");
 		return;
 	}
 
-	psc->sc_bar1_val = base | PCI_MAPREG_TYPE_MEM;
-
 	error = pci_mapreg_map(pa, b2, PCI_MAPREG_TYPE_MEM |
 	    PCI_MAPREG_MEM_TYPE_32BIT, 0, &sc->sc_mem2_bt,
-	    &sc->sc_mem2_bh, &base, &psc->sc_mapsize2, 0);
+	    &sc->sc_mem2_bh, NULL, &psc->sc_mapsize2, 0);
 	if (error != 0) {
 		printf(": could not map memory2 space\n");
 		return;
 	}
 
-	psc->sc_bar2_val = base | PCI_MAPREG_TYPE_MEM;
-
 	if (pci_intr_map(pa, &ih) != 0) {
 		printf(": could not map interrupt\n");
 		return;
diff --git a/sys/dev/pci/if_pgt_pci.c b/sys/dev/pci/if_pgt_pci.c
index 0a66c4aa753..16504067d49 100644
--- a/sys/dev/pci/if_pgt_pci.c
+++ b/sys/dev/pci/if_pgt_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pgt_pci.c,v 1.8 2006/11/10 20:20:04 damien Exp $  */
+/*	$OpenBSD: if_pgt_pci.c,v 1.9 2006/11/18 20:44:40 grange Exp $  */
 
 /*
  * Copyright (c) 2006 Marcus Glocker <mglocker@openbsd.org>
@@ -65,7 +65,6 @@ struct pgt_pci_softc {
 	pci_chipset_tag_t       sc_pc;
 	void 			*sc_ih;
 	bus_size_t		sc_mapsize;
-	pcireg_t		sc_bar0_val;
 };
 
 struct cfattach pgt_pci_ca = {
@@ -92,7 +91,6 @@ pgt_pci_attach(struct device *parent, struct device *self, void *aux)
 	struct pgt_softc *sc = &psc->sc_pgt;
 	struct pci_attach_args *pa = aux;
 	const char *intrstr = NULL;
-	bus_addr_t base;
 	pci_intr_handle_t ih;
 	int error;
 
@@ -106,12 +104,11 @@ pgt_pci_attach(struct device *parent, struct device *self, void *aux)
 	/* map control / status registers */
 	error = pci_mapreg_map(pa, PGT_PCI_BAR0,
 	    PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0,
-	    &sc->sc_iotag, &sc->sc_iohandle, &base, &psc->sc_mapsize, 0);
+	    &sc->sc_iotag, &sc->sc_iohandle, NULL, &psc->sc_mapsize, 0);
 	if (error != 0) {
 		printf(": could not map memory space\n");
 		return;
 	}
-	psc->sc_bar0_val = base | PCI_MAPREG_TYPE_MEM;
 
 	/* map interrupt */
 	if (pci_intr_map(pa, &ih) != 0) {
diff --git a/sys/dev/pci/if_ral_pci.c b/sys/dev/pci/if_ral_pci.c
index 76cc54fa830..af4b3a22663 100644
--- a/sys/dev/pci/if_ral_pci.c
+++ b/sys/dev/pci/if_ral_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ral_pci.c,v 1.7 2006/10/22 12:14:44 damien Exp $  */
+/*	$OpenBSD: if_ral_pci.c,v 1.8 2006/11/18 20:44:40 grange Exp $  */
 
 /*-
  * Copyright (c) 2005, 2006
@@ -117,7 +117,6 @@ ral_pci_attach(struct device *parent, struct device *self, void *aux)
 	struct rt2560_softc *sc = &psc->sc_sc;
 	struct pci_attach_args *pa = aux;
 	const char *intrstr;
-	bus_addr_t base;
 	pci_intr_handle_t ih;
 	int error;
 
@@ -129,7 +128,7 @@ ral_pci_attach(struct device *parent, struct device *self, void *aux)
 
 	/* map control/status registers */
 	error = pci_mapreg_map(pa, RAL_PCI_BAR0, PCI_MAPREG_TYPE_MEM |
-	    PCI_MAPREG_MEM_TYPE_32BIT, 0, &sc->sc_st, &sc->sc_sh, &base,
+	    PCI_MAPREG_MEM_TYPE_32BIT, 0, &sc->sc_st, &sc->sc_sh, NULL,
 	    &psc->sc_mapsize, 0);
 	if (error != 0) {
 		printf(": could not map memory space\n");