diff options
| author | yongari <yongari@FreeBSD.org> | 2009-12-22 21:44:25 +0000 |
|---|---|---|
| committer | yongari <yongari@FreeBSD.org> | 2009-12-22 21:44:25 +0000 |
| commit | 4918b61e08b0f64301404c54cc49692bf35da460 (patch) | |
| tree | 04ec364e2055771032bc557f264ced7875bb32f0 | |
| parent | c8a5b1a6c8076d6ccf799c38eecd3b6485bea3be (diff) | |
| download | FreeBSD-src-4918b61e08b0f64301404c54cc49692bf35da460.zip FreeBSD-src-4918b61e08b0f64301404c54cc49692bf35da460.tar.gz | |
Prefer bus_write_{1,2,4}/bus_read_{1,2,4} to
bus_space_write_{1,2,4}/bus_space_read_{1,2,4}.
Remove unused ste_bhandle and ste_btag in softc.
| -rw-r--r-- | sys/dev/ste/if_ste.c | 3 | ||||
| -rw-r--r-- | sys/dev/ste/if_stereg.h | 14 |
2 files changed, 6 insertions, 11 deletions
diff --git a/sys/dev/ste/if_ste.c b/sys/dev/ste/if_ste.c index 3faf0d0..e8dfc83 100644 --- a/sys/dev/ste/if_ste.c +++ b/sys/dev/ste/if_ste.c @@ -972,9 +972,6 @@ ste_attach(device_t dev) goto fail; } - sc->ste_btag = rman_get_bustag(sc->ste_res); - sc->ste_bhandle = rman_get_bushandle(sc->ste_res); - /* Allocate interrupt */ rid = 0; sc->ste_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, diff --git a/sys/dev/ste/if_stereg.h b/sys/dev/ste/if_stereg.h index 081b872..c0adcad 100644 --- a/sys/dev/ste/if_stereg.h +++ b/sys/dev/ste/if_stereg.h @@ -465,18 +465,18 @@ struct ste_desc_onefrag { * register space access macros */ #define CSR_WRITE_4(sc, reg, val) \ - bus_space_write_4(sc->ste_btag, sc->ste_bhandle, reg, val) + bus_write_4((sc)->ste_res, reg, val) #define CSR_WRITE_2(sc, reg, val) \ - bus_space_write_2(sc->ste_btag, sc->ste_bhandle, reg, val) + bus_write_2((sc)->ste_res, reg, val) #define CSR_WRITE_1(sc, reg, val) \ - bus_space_write_1(sc->ste_btag, sc->ste_bhandle, reg, val) + bus_write_1((sc)->ste_res, reg, val) #define CSR_READ_4(sc, reg) \ - bus_space_read_4(sc->ste_btag, sc->ste_bhandle, reg) + bus_read_4((sc)->ste_res, reg) #define CSR_READ_2(sc, reg) \ - bus_space_read_2(sc->ste_btag, sc->ste_bhandle, reg) + bus_read_2((sc)->ste_res, reg) #define CSR_READ_1(sc, reg) \ - bus_space_read_1(sc->ste_btag, sc->ste_bhandle, reg) + bus_read_1((sc)->ste_res, reg) #define STE_DESC_ALIGN 8 #define STE_RX_LIST_CNT 128 @@ -544,8 +544,6 @@ struct ste_chain_data { struct ste_softc { struct ifnet *ste_ifp; - bus_space_tag_t ste_btag; - bus_space_handle_t ste_bhandle; struct resource *ste_res; int ste_res_id; int ste_res_type; |
