diff options
author | David S. Miller <davem@davemloft.net> | 2008-12-26 18:10:00 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-26 18:10:00 -0500 |
commit | 2d5451d2614583de0c9aaf61cf5f77faf5694105 (patch) | |
tree | 03237a37f949b384ca59698b24f72f397c99959d /drivers/net/s2io.c | |
parent | 0da2afd59653d2edf5c8e0f09b23f367ab5bc80f (diff) |
net: Fix warning fallout from recent NAPI interface changes.
When we removed the network device argument from several
NAPI interfaces in 908a7a16b852ffd618a9127be8d62432182d81b4
("net: Remove unused netdev arg from some NAPI interfaces.")
several drivers now started getting unused variable warnings.
This fixes those up.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r-- | drivers/net/s2io.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 748b4cb3a58a..f5c57c059bca 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -2866,7 +2866,6 @@ static int s2io_poll_inta(struct napi_struct *napi, int budget) | |||
2866 | { | 2866 | { |
2867 | struct s2io_nic *nic = container_of(napi, struct s2io_nic, napi); | 2867 | struct s2io_nic *nic = container_of(napi, struct s2io_nic, napi); |
2868 | struct ring_info *ring; | 2868 | struct ring_info *ring; |
2869 | struct net_device *dev = nic->dev; | ||
2870 | struct config_param *config; | 2869 | struct config_param *config; |
2871 | struct mac_info *mac_control; | 2870 | struct mac_info *mac_control; |
2872 | int pkts_processed = 0; | 2871 | int pkts_processed = 0; |
@@ -4330,7 +4329,6 @@ static irqreturn_t s2io_msix_ring_handle(int irq, void *dev_id) | |||
4330 | struct ring_info *ring = (struct ring_info *)dev_id; | 4329 | struct ring_info *ring = (struct ring_info *)dev_id; |
4331 | struct s2io_nic *sp = ring->nic; | 4330 | struct s2io_nic *sp = ring->nic; |
4332 | struct XENA_dev_config __iomem *bar0 = sp->bar0; | 4331 | struct XENA_dev_config __iomem *bar0 = sp->bar0; |
4333 | struct net_device *dev = sp->dev; | ||
4334 | 4332 | ||
4335 | if (unlikely(!is_s2io_card_up(sp))) | 4333 | if (unlikely(!is_s2io_card_up(sp))) |
4336 | return IRQ_HANDLED; | 4334 | return IRQ_HANDLED; |