diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2008-04-21 17:44:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-21 17:44:16 -0400 |
commit | 02651d20a3f90dab8920dad00dec8f62f2b6a7ea (patch) | |
tree | 370d13710346b231db9f4ab5feba30b46d9dbf75 | |
parent | 92998dd4951a84cbde447eeac4af5770718864b8 (diff) |
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>
-rw-r--r-- | drivers/net/hamradio/dmascc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c index e04bf9926441..0b94833e23f7 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) | |||
1083 | if (t == 0) { | 1083 | if (t == 0) { |
1084 | tm_isr(priv); | 1084 | tm_isr(priv); |
1085 | } else if (t > 0) { | 1085 | } else if (t > 0) { |
1086 | save_flags(flags); | ||
1087 | cli(); | ||
1088 | outb(t & 0xFF, priv->tmr_cnt); | 1086 | outb(t & 0xFF, priv->tmr_cnt); |
1089 | outb((t >> 8) & 0xFF, priv->tmr_cnt); | 1087 | outb((t >> 8) & 0xFF, priv->tmr_cnt); |
1090 | if (priv->type != TYPE_TWIN) { | 1088 | if (priv->type != TYPE_TWIN) { |
1091 | write_scc(priv, R15, r15 | CTSIE); | 1089 | write_scc(priv, R15, r15 | CTSIE); |
1092 | priv->rr0 |= CTS; | 1090 | priv->rr0 |= CTS; |
1093 | } | 1091 | } |
1094 | restore_flags(flags); | ||
1095 | } | 1092 | } |
1096 | } | 1093 | } |
1097 | 1094 | ||