diff options
| author | Mateusz Guzik <mjg@FreeBSD.org> | 2020-09-01 22:00:48 +0000 |
|---|---|---|
| committer | Mateusz Guzik <mjg@FreeBSD.org> | 2020-09-01 22:00:48 +0000 |
| commit | ba9f0c72dd2debbb4b1fa05ee2663163bff16c87 (patch) | |
| tree | 545fd2fcbbed9274a1172db9d465c3ff1e711a4c /sys/dev/pccbb | |
| parent | 58263fc56e647d97b208ee87a5e19f1753b34cae (diff) | |
Notes
Diffstat (limited to 'sys/dev/pccbb')
| -rw-r--r-- | sys/dev/pccbb/pccbb.c | 6 | ||||
| -rw-r--r-- | sys/dev/pccbb/pccbbreg.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c index bae8363831fa4..c518551e1b43c 100644 --- a/sys/dev/pccbb/pccbb.c +++ b/sys/dev/pccbb/pccbb.c @@ -193,7 +193,7 @@ static struct resource * cbb_find_res(struct cbb_softc *sc, int type, int rid) { struct cbb_reslist *rle; - + SLIST_FOREACH(rle, &sc->rl, link) if (SYS_RES_MEMORY == rle->type && rid == rle->rid) return (rle->res); @@ -405,7 +405,6 @@ cbb_teardown_intr(device_t dev, device_t child, struct resource *irq, return (0); } - void cbb_driver_added(device_t brdev, driver_t *driver) { @@ -884,7 +883,7 @@ cbb_current_voltage(device_t brdev) { struct cbb_softc *sc = device_get_softc(brdev); uint32_t ctrl; - + ctrl = cbb_get(sc, CBB_SOCKET_CONTROL); switch (ctrl & CBB_SOCKET_CTRL_VCCMASK) { case CBB_SOCKET_CTRL_VCC_5V: @@ -1497,7 +1496,6 @@ cbb_pcic_set_memory_offset(device_t brdev, device_t child, int rid, /* BUS Methods */ /************************************************************************/ - int cbb_activate_resource(device_t brdev, device_t child, int type, int rid, struct resource *r) diff --git a/sys/dev/pccbb/pccbbreg.h b/sys/dev/pccbb/pccbbreg.h index 3fb7e6a53074d..55597ec0cb725 100644 --- a/sys/dev/pccbb/pccbbreg.h +++ b/sys/dev/pccbb/pccbbreg.h @@ -62,7 +62,6 @@ * Register definitions for PCI to Cardbus Bridge chips */ - /* PCI header registers */ #define CBBR_SOCKBASE 0x10 /* len=4 */ @@ -188,7 +187,6 @@ # define TOPIC97_REG_CTRL_CAUDIO_OFF 0x00000002 # define TOPIC_REG_CTRL_CAUDIO_INVERT 0x00000001 - /* Socket definitions */ #define CBB_SOCKET_EVENT_CSTS 0x01 /* Card Status Change */ #define CBB_SOCKET_EVENT_CD1 0x02 /* Card Detect 1 */ |