summaryrefslogtreecommitdiffstats
path: root/drivers/net/hamradio
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2008-04-21 14:44:16 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-21 14:44:16 -0700
commit02651d20a3f90dab8920dad00dec8f62f2b6a7ea (patch)
tree370d13710346b231db9f4ab5feba30b46d9dbf75 /drivers/net/hamradio
parent92998dd4951a84cbde447eeac4af5770718864b8 (diff)
downloadop-kernel-dev-02651d20a3f90dab8920dad00dec8f62f2b6a7ea.zip
op-kernel-dev-02651d20a3f90dab8920dad00dec8f62f2b6a7ea.tar.gz
hamradio: Remove unneeded and deprecated cli()/sti() calls in dmascc.c
These cli()/sti() calls are made in start_timer() and are therefor redundant since the register_lock is now used to protect register io from within scc_isr() and write_scc() (where all calls to start_timer() originate). Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hamradio')
-rw-r--r--drivers/net/hamradio/dmascc.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index e04bf99..0b94833 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -1083,15 +1083,12 @@ static void start_timer(struct scc_priv *priv, int t, int r15)
if (t == 0) {
tm_isr(priv);
} else if (t > 0) {
- save_flags(flags);
- cli();
outb(t & 0xFF, priv->tmr_cnt);
outb((t >> 8) & 0xFF, priv->tmr_cnt);
if (priv->type != TYPE_TWIN) {
write_scc(priv, R15, r15 | CTSIE);
priv->rr0 |= CTS;
}
- restore_flags(flags);
}
}
OpenPOWER on IntegriCloud