diff options
author | Jeff Garzik <jeff@garzik.org> | 2008-06-27 02:20:20 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-06-28 10:23:38 -0400 |
commit | be0976be9148f31ee0d1997354c3e30ff8d07587 (patch) | |
tree | 18792bffd7130b7c3894c64992f60e388e111141 /drivers/net/typhoon.c | |
parent | 28cd4289abc2c8db90344ee4ff064a9bdf086fdf (diff) |
[netdrvr] kill sync_irq-before-freq_irq pattern
synchronize_irq() is superfluous when free_irq() call immediately follows it,
because free_irq() also does a synchronize_irq() call of its own.
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/typhoon.c')
-rw-r--r-- | drivers/net/typhoon.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index c0dd25ba7a18..8549f1159a30 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
@@ -334,8 +334,6 @@ enum state_values { | |||
334 | #define TYPHOON_RESET_TIMEOUT_NOSLEEP ((6 * 1000000) / TYPHOON_UDELAY) | 334 | #define TYPHOON_RESET_TIMEOUT_NOSLEEP ((6 * 1000000) / TYPHOON_UDELAY) |
335 | #define TYPHOON_WAIT_TIMEOUT ((1000000 / 2) / TYPHOON_UDELAY) | 335 | #define TYPHOON_WAIT_TIMEOUT ((1000000 / 2) / TYPHOON_UDELAY) |
336 | 336 | ||
337 | #define typhoon_synchronize_irq(x) synchronize_irq(x) | ||
338 | |||
339 | #if defined(NETIF_F_TSO) | 337 | #if defined(NETIF_F_TSO) |
340 | #define skb_tso_size(x) (skb_shinfo(x)->gso_size) | 338 | #define skb_tso_size(x) (skb_shinfo(x)->gso_size) |
341 | #define TSO_NUM_DESCRIPTORS 2 | 339 | #define TSO_NUM_DESCRIPTORS 2 |
@@ -2143,7 +2141,6 @@ typhoon_close(struct net_device *dev) | |||
2143 | printk(KERN_ERR "%s: unable to stop runtime\n", dev->name); | 2141 | printk(KERN_ERR "%s: unable to stop runtime\n", dev->name); |
2144 | 2142 | ||
2145 | /* Make sure there is no irq handler running on a different CPU. */ | 2143 | /* Make sure there is no irq handler running on a different CPU. */ |
2146 | typhoon_synchronize_irq(dev->irq); | ||
2147 | free_irq(dev->irq, dev); | 2144 | free_irq(dev->irq, dev); |
2148 | 2145 | ||
2149 | typhoon_free_rx_rings(tp); | 2146 | typhoon_free_rx_rings(tp); |