diff options
author | imp <imp@FreeBSD.org> | 2001-07-31 15:53:17 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2001-07-31 15:53:17 +0000 |
commit | 3d3900e5cabb699ebe6342d6b8d96d114215417f (patch) | |
tree | 47b0a87bcb6db725239f37a2e1704dbd344cb06d | |
parent | 9cd078f86a3f80bf532f348e1f4722937f91c0b6 (diff) | |
download | FreeBSD-src-3d3900e5cabb699ebe6342d6b8d96d114215417f.zip FreeBSD-src-3d3900e5cabb699ebe6342d6b8d96d114215417f.tar.gz |
bsh and bst are unused in softc, except for setting them. We do use the
bsh and bst in the pcic_slot structures.
-rw-r--r-- | sys/pccard/pcic_pci.c | 8 | ||||
-rw-r--r-- | sys/pccard/pcicvar.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/pccard/pcic_pci.c b/sys/pccard/pcic_pci.c index ad033a3..0314585 100644 --- a/sys/pccard/pcic_pci.c +++ b/sys/pccard/pcic_pci.c @@ -551,8 +551,8 @@ pcic_pci_attach(device_t dev) return (ENOMEM); sp->getb = pcic_getb_io; sp->putb = pcic_putb_io; - sc->bst = sp->bst = rman_get_bustag(sc->iores); - sc->bsh = sp->bsh = rman_get_bushandle(sc->iores); + sp->bst = rman_get_bustag(sc->iores); + sp->bsh = rman_get_bushandle(sc->iores); sp->offset = pci_get_function(dev) * PCIC_SLOT_SIZE; sp->controller = PCIC_PD672X; sp->revision = 0; @@ -566,8 +566,8 @@ pcic_pci_attach(device_t dev) sp->getb = pcic_pci_getb2; sp->putb = pcic_pci_putb2; sp->offset = CB_EXCA_OFFSET; - sc->bst = sp->bst = rman_get_bustag(sc->memres); - sc->bsh = sp->bsh = rman_get_bushandle(sc->memres); + sp->bst = rman_get_bustag(sc->memres); + sp->bsh = rman_get_bushandle(sc->memres); itm = pcic_pci_lookup(device_id, &pcic_pci_devs[0]); if (itm != NULL) { sp->controller = itm->type; diff --git a/sys/pccard/pcicvar.h b/sys/pccard/pcicvar.h index 2369565..1fdbaf5 100644 --- a/sys/pccard/pcicvar.h +++ b/sys/pccard/pcicvar.h @@ -64,8 +64,6 @@ struct pcic_softc void *ih; /* Our interrupt handler. */ int irq; device_t dev; /* Our device */ - bus_space_tag_t bst; /* Bus tag for our regs */ - bus_space_handle_t bsh; /* Bus handle for our regs */ void (*slot_poll)(void *); struct callout_handle timeout_ch; struct pcic_slot slots[PCIC_MAX_SLOTS]; |