diff options
| author | dim <dim@FreeBSD.org> | 2014-01-04 21:32:53 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-01-04 21:32:53 +0000 |
| commit | 6f23e4f462886b4437cb46ac3a0e81462a8f1c0b (patch) | |
| tree | c9a0fa95b6922dbf6c8c462f7d87b0d61a61e306 | |
| parent | b5bbabfb5f565b75f9c75ffac19bb8e69d2f5a00 (diff) | |
| download | FreeBSD-src-6f23e4f462886b4437cb46ac3a0e81462a8f1c0b.zip FreeBSD-src-6f23e4f462886b4437cb46ac3a0e81462a8f1c0b.tar.gz | |
MFC r260057:
In sys/dev/scc, remove unused static function scc_setmreg(). While
here, invoke scc_getmreg() in two more places where it can be used.
Reviewed by: marcel
| -rw-r--r-- | sys/dev/scc/scc_dev_z8530.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sys/dev/scc/scc_dev_z8530.c b/sys/dev/scc/scc_dev_z8530.c index 0920d45..764819f 100644 --- a/sys/dev/scc/scc_dev_z8530.c +++ b/sys/dev/scc/scc_dev_z8530.c @@ -66,15 +66,6 @@ struct scc_class scc_z8530_class = { }; /* Multiplexed I/O. */ -static __inline void -scc_setmreg(struct scc_bas *bas, int ch, int reg, int val) -{ - - scc_setreg(bas, ch + REG_CTRL, reg); - scc_barrier(bas); - scc_setreg(bas, ch + REG_CTRL, val); -} - static __inline uint8_t scc_getmreg(struct scc_bas *bas, int ch, int reg) { @@ -146,9 +137,7 @@ z8530_bfe_ipend(struct scc_softc *sc) if (ip & IP_TIB) ch[1]->ch_ipend |= SER_INT_TXIDLE; if (ip & IP_SIA) { - scc_setreg(bas, CHAN_A + REG_CTRL, CR_RSTXSI); - scc_barrier(bas); - bes = scc_getreg(bas, CHAN_A + REG_CTRL); + bes = scc_getmreg(bas, CHAN_A, CR_RSTXSI); if (bes & BES_BRK) ch[0]->ch_ipend |= SER_INT_BREAK; sig = ch[0]->ch_hwsig; @@ -164,9 +153,7 @@ z8530_bfe_ipend(struct scc_softc *sc) ch[0]->ch_ipend |= SER_INT_OVERRUN; } if (ip & IP_SIB) { - scc_setreg(bas, CHAN_B + REG_CTRL, CR_RSTXSI); - scc_barrier(bas); - bes = scc_getreg(bas, CHAN_B + REG_CTRL); + bes = scc_getmreg(bas, CHAN_B, CR_RSTXSI); if (bes & BES_BRK) ch[1]->ch_ipend |= SER_INT_BREAK; sig = ch[1]->ch_hwsig; |
