]> err.no Git - linux-2.6/commitdiff
hamradio: Remove unneeded and deprecated cli()/sti() calls in dmascc.c
authorMark Asselstine <mark.asselstine@windriver.com>
Mon, 21 Apr 2008 21:44:16 +0000 (14:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 21 Apr 2008 21:44:16 +0000 (14:44 -0700)
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>
drivers/net/hamradio/dmascc.c

index e04bf992644197f4eb211e1ff42122cb7e2fbcb2..0b94833e23f7a48b76d16e3f5419d24d7f0556a7 100644 (file)
@@ -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);
        }
 }