aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-26 18:10:00 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-26 18:10:00 -0500
commit2d5451d2614583de0c9aaf61cf5f77faf5694105 (patch)
tree03237a37f949b384ca59698b24f72f397c99959d
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>
-rw-r--r--drivers/infiniband/hw/nes/nes_nic.c1
-rw-r--r--drivers/net/atl1e/atl1e_main.c1
-rw-r--r--drivers/net/b44.c1
-rw-r--r--drivers/net/bnx2x_main.c1
-rw-r--r--drivers/net/chelsio/sge.c3
-rw-r--r--drivers/net/ixgb/ixgb_main.c1
-rw-r--r--drivers/net/myri10ge/myri10ge.c1
-rw-r--r--drivers/net/qla3xxx.c1
-rw-r--r--drivers/net/qlge/qlge_main.c1
-rw-r--r--drivers/net/s2io.c2
-rw-r--r--drivers/net/sfc/efx.c1
11 files changed, 0 insertions, 14 deletions
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 80e7a4d98d5b..57a47cf7e513 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -99,7 +99,6 @@ static int nics_per_function = 1;
99static int nes_netdev_poll(struct napi_struct *napi, int budget) 99static int nes_netdev_poll(struct napi_struct *napi, int budget)
100{ 100{
101 struct nes_vnic *nesvnic = container_of(napi, struct nes_vnic, napi); 101 struct nes_vnic *nesvnic = container_of(napi, struct nes_vnic, napi);
102 struct net_device *netdev = nesvnic->netdev;
103 struct nes_device *nesdev = nesvnic->nesdev; 102 struct nes_device *nesdev = nesvnic->nesdev;
104 struct nes_hw_nic_cq *nescq = &nesvnic->nic_cq; 103 struct nes_hw_nic_cq *nescq = &nesvnic->nic_cq;
105 104
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index a72a46145ed7..bb9094d4cbc9 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -1501,7 +1501,6 @@ static int atl1e_clean(struct napi_struct *napi, int budget)
1501{ 1501{
1502 struct atl1e_adapter *adapter = 1502 struct atl1e_adapter *adapter =
1503 container_of(napi, struct atl1e_adapter, napi); 1503 container_of(napi, struct atl1e_adapter, napi);
1504 struct net_device *netdev = adapter->netdev;
1505 struct pci_dev *pdev = adapter->pdev; 1504 struct pci_dev *pdev = adapter->pdev;
1506 u32 imr_data; 1505 u32 imr_data;
1507 int work_done = 0; 1506 int work_done = 0;
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 934a95091dc3..0e7470a201f0 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -846,7 +846,6 @@ static int b44_rx(struct b44 *bp, int budget)
846static int b44_poll(struct napi_struct *napi, int budget) 846static int b44_poll(struct napi_struct *napi, int budget)
847{ 847{
848 struct b44 *bp = container_of(napi, struct b44, napi); 848 struct b44 *bp = container_of(napi, struct b44, napi);
849 struct net_device *netdev = bp->dev;
850 int work_done; 849 int work_done;
851 850
852 spin_lock_irq(&bp->lock); 851 spin_lock_irq(&bp->lock);
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 02ab9b0ea697..ef8103b3523e 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -1592,7 +1592,6 @@ static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie)
1592{ 1592{
1593 struct bnx2x_fastpath *fp = fp_cookie; 1593 struct bnx2x_fastpath *fp = fp_cookie;
1594 struct bnx2x *bp = fp->bp; 1594 struct bnx2x *bp = fp->bp;
1595 struct net_device *dev = bp->dev;
1596 int index = FP_IDX(fp); 1595 int index = FP_IDX(fp);
1597 1596
1598 /* Return here if interrupt is disabled */ 1597 /* Return here if interrupt is disabled */
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index 7896468dda11..d984b7995763 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -1609,7 +1609,6 @@ static int process_pure_responses(struct adapter *adapter)
1609int t1_poll(struct napi_struct *napi, int budget) 1609int t1_poll(struct napi_struct *napi, int budget)
1610{ 1610{
1611 struct adapter *adapter = container_of(napi, struct adapter, napi); 1611 struct adapter *adapter = container_of(napi, struct adapter, napi);
1612 struct net_device *dev = adapter->port[0].dev;
1613 int work_done = process_responses(adapter, budget); 1612 int work_done = process_responses(adapter, budget);
1614 1613
1615 if (likely(work_done < budget)) { 1614 if (likely(work_done < budget)) {
@@ -1627,8 +1626,6 @@ irqreturn_t t1_interrupt(int irq, void *data)
1627 int handled; 1626 int handled;
1628 1627
1629 if (likely(responses_pending(adapter))) { 1628 if (likely(responses_pending(adapter))) {
1630 struct net_device *dev = sge->netdev;
1631
1632 writel(F_PL_INTR_SGE_DATA, adapter->regs + A_PL_CAUSE); 1629 writel(F_PL_INTR_SGE_DATA, adapter->regs + A_PL_CAUSE);
1633 1630
1634 if (napi_schedule_prep(&adapter->napi)) { 1631 if (napi_schedule_prep(&adapter->napi)) {
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 679125b3bbc9..eee28d395682 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1742,7 +1742,6 @@ static int
1742ixgb_clean(struct napi_struct *napi, int budget) 1742ixgb_clean(struct napi_struct *napi, int budget)
1743{ 1743{
1744 struct ixgb_adapter *adapter = container_of(napi, struct ixgb_adapter, napi); 1744 struct ixgb_adapter *adapter = container_of(napi, struct ixgb_adapter, napi);
1745 struct net_device *netdev = adapter->netdev;
1746 int work_done = 0; 1745 int work_done = 0;
1747 1746
1748 ixgb_clean_tx_irq(adapter); 1747 ixgb_clean_tx_irq(adapter);
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 2da3ce17b981..5e70180bf569 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -1503,7 +1503,6 @@ static int myri10ge_poll(struct napi_struct *napi, int budget)
1503{ 1503{
1504 struct myri10ge_slice_state *ss = 1504 struct myri10ge_slice_state *ss =
1505 container_of(napi, struct myri10ge_slice_state, napi); 1505 container_of(napi, struct myri10ge_slice_state, napi);
1506 struct net_device *netdev = ss->mgp->dev;
1507 int work_done; 1506 int work_done;
1508 1507
1509#ifdef CONFIG_MYRI10GE_DCA 1508#ifdef CONFIG_MYRI10GE_DCA
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 33e8e62b4502..189ec29ac7a4 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -2284,7 +2284,6 @@ static int ql_tx_rx_clean(struct ql3_adapter *qdev,
2284static int ql_poll(struct napi_struct *napi, int budget) 2284static int ql_poll(struct napi_struct *napi, int budget)
2285{ 2285{
2286 struct ql3_adapter *qdev = container_of(napi, struct ql3_adapter, napi); 2286 struct ql3_adapter *qdev = container_of(napi, struct ql3_adapter, napi);
2287 struct net_device *ndev = qdev->ndev;
2288 int rx_cleaned = 0, tx_cleaned = 0; 2287 int rx_cleaned = 0, tx_cleaned = 0;
2289 unsigned long hw_flags; 2288 unsigned long hw_flags;
2290 struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; 2289 struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 4070d53c94aa..718a7bd0cd1a 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -1732,7 +1732,6 @@ static irqreturn_t qlge_msix_tx_isr(int irq, void *dev_id)
1732static irqreturn_t qlge_msix_rx_isr(int irq, void *dev_id) 1732static irqreturn_t qlge_msix_rx_isr(int irq, void *dev_id)
1733{ 1733{
1734 struct rx_ring *rx_ring = dev_id; 1734 struct rx_ring *rx_ring = dev_id;
1735 struct ql_adapter *qdev = rx_ring->qdev;
1736 netif_rx_schedule(&rx_ring->napi); 1735 netif_rx_schedule(&rx_ring->napi);
1737 return IRQ_HANDLED; 1736 return IRQ_HANDLED;
1738} 1737}
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;
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 5cc59e654d77..7673fd92eaf5 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -216,7 +216,6 @@ static int efx_poll(struct napi_struct *napi, int budget)
216{ 216{
217 struct efx_channel *channel = 217 struct efx_channel *channel =
218 container_of(napi, struct efx_channel, napi_str); 218 container_of(napi, struct efx_channel, napi_str);
219 struct net_device *napi_dev = channel->napi_dev;
220 int rx_packets; 219 int rx_packets;
221 220
222 EFX_TRACE(channel->efx, "channel %d NAPI poll executing on CPU %d\n", 221 EFX_TRACE(channel->efx, "channel %d NAPI poll executing on CPU %d\n",