summaryrefslogtreecommitdiffstats
path: root/drivers/net/s2io.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-26 15:10:00 -0800
committerDavid S. Miller <davem@davemloft.net>2008-12-26 15:10:00 -0800
commit2d5451d2614583de0c9aaf61cf5f77faf5694105 (patch)
tree03237a37f949b384ca59698b24f72f397c99959d /drivers/net/s2io.c
parent0da2afd59653d2edf5c8e0f09b23f367ab5bc80f (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.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 748b4cb3a58..f5c57c059bc 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)
{
struct s2io_nic *nic = container_of(napi, struct s2io_nic, napi);
struct ring_info *ring;
- struct net_device *dev = nic->dev;
struct config_param *config;
struct mac_info *mac_control;
int pkts_processed = 0;
@@ -4330,7 +4329,6 @@ static irqreturn_t s2io_msix_ring_handle(int irq, void *dev_id)
struct ring_info *ring = (struct ring_info *)dev_id;
struct s2io_nic *sp = ring->nic;
struct XENA_dev_config __iomem *bar0 = sp->bar0;
- struct net_device *dev = sp->dev;
if (unlikely(!is_s2io_card_up(sp)))
return IRQ_HANDLED;