diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-30 03:53:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:44 -0400 |
commit | f5592268a5aa5e02f36f396de47c94a1506e3678 (patch) | |
tree | 1c5d4b301928cbfd55ebf57e0808c95d2615f6aa | |
parent | ec09cd562135158dcb8a6c08e5a9efa36febedb1 (diff) |
char: fix sparse shadowed variable warnings in esp.c
flags only use was in spin_lock_irqsave/spin_lock_irgrestore pairs, no
need to redeclare for each one.
drivers/char/esp.c:1599:17: warning: symbol 'flags' shadows an earlier one
drivers/char/esp.c:1517:16: originally declared here
drivers/char/esp.c:1615:17: warning: symbol 'flags' shadows an earlier one
drivers/char/esp.c:1517:16: originally declared here
drivers/char/esp.c:1631:17: warning: symbol 'flags' shadows an earlier one
drivers/char/esp.c:1517:16: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/char/esp.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/char/esp.c b/drivers/char/esp.c index 5ad11a6716c7..763d6d2e4b62 100644 --- a/drivers/char/esp.c +++ b/drivers/char/esp.c | |||
@@ -1600,8 +1600,6 @@ static int set_esp_config(struct esp_struct * info, | |||
1600 | 1600 | ||
1601 | if ((new_config.flow_off != info->config.flow_off) || | 1601 | if ((new_config.flow_off != info->config.flow_off) || |
1602 | (new_config.flow_on != info->config.flow_on)) { | 1602 | (new_config.flow_on != info->config.flow_on)) { |
1603 | unsigned long flags; | ||
1604 | |||
1605 | info->config.flow_off = new_config.flow_off; | 1603 | info->config.flow_off = new_config.flow_off; |
1606 | info->config.flow_on = new_config.flow_on; | 1604 | info->config.flow_on = new_config.flow_on; |
1607 | 1605 | ||
@@ -1616,8 +1614,6 @@ static int set_esp_config(struct esp_struct * info, | |||
1616 | 1614 | ||
1617 | if ((new_config.rx_trigger != info->config.rx_trigger) || | 1615 | if ((new_config.rx_trigger != info->config.rx_trigger) || |
1618 | (new_config.tx_trigger != info->config.tx_trigger)) { | 1616 | (new_config.tx_trigger != info->config.tx_trigger)) { |
1619 | unsigned long flags; | ||
1620 | |||
1621 | info->config.rx_trigger = new_config.rx_trigger; | 1617 | info->config.rx_trigger = new_config.rx_trigger; |
1622 | info->config.tx_trigger = new_config.tx_trigger; | 1618 | info->config.tx_trigger = new_config.tx_trigger; |
1623 | spin_lock_irqsave(&info->lock, flags); | 1619 | spin_lock_irqsave(&info->lock, flags); |
@@ -1632,8 +1628,6 @@ static int set_esp_config(struct esp_struct * info, | |||
1632 | } | 1628 | } |
1633 | 1629 | ||
1634 | if (new_config.rx_timeout != info->config.rx_timeout) { | 1630 | if (new_config.rx_timeout != info->config.rx_timeout) { |
1635 | unsigned long flags; | ||
1636 | |||
1637 | info->config.rx_timeout = new_config.rx_timeout; | 1631 | info->config.rx_timeout = new_config.rx_timeout; |
1638 | spin_lock_irqsave(&info->lock, flags); | 1632 | spin_lock_irqsave(&info->lock, flags); |
1639 | 1633 | ||