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>

diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 80e7a4d98d5ba15443933cdb48f8085040b3cd8c..57a47cf7e513ca60d86a1a108454f36248bcd16a 100644 (file)
--- 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;
 static int nes_netdev_poll(struct napi_struct *napi, int budget)
 {
        struct nes_vnic *nesvnic = container_of(napi, struct nes_vnic, napi);
-       struct net_device *netdev = nesvnic->netdev;
        struct nes_device *nesdev = nesvnic->nesdev;
        struct nes_hw_nic_cq *nescq = &nesvnic->nic_cq;
 

diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index a72a46145ed78ef896b07ddd83aaf1e463093535..bb9094d4cbc9014f2686033162cfde22fcc0d972 100644 (file)
--- 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)
 {
        struct atl1e_adapter *adapter =
                        container_of(napi, struct atl1e_adapter, napi);
-       struct net_device *netdev  = adapter->netdev;
        struct pci_dev    *pdev    = adapter->pdev;
        u32 imr_data;
        int work_done = 0;

diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 934a95091dc3d72176ff00c0fdc95c19bd2cd5f3..0e7470a201f0ec18eb06c860495d5e6022679845 100644 (file)
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -846,7 +846,6 @@ static int b44_rx(struct b44 *bp, int budget)
 static int b44_poll(struct napi_struct *napi, int budget)
 {
        struct b44 *bp = container_of(napi, struct b44, napi);
-       struct net_device *netdev = bp->dev;
        int work_done;
 
        spin_lock_irq(&bp->lock);

diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 02ab9b0ea697bd6123fdbb18bc6f3b81c1ea978e..ef8103b3523e0e80695caf1d032034c6ff3c9b6b 100644 (file)
--- 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)
 {
        struct bnx2x_fastpath *fp = fp_cookie;
        struct bnx2x *bp = fp->bp;
-       struct net_device *dev = bp->dev;
        int index = FP_IDX(fp);
 
        /* Return here if interrupt is disabled */

diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index 7896468dda119786f36f0f158a3edebfeed58928..d984b799576373f1c7a7064d8180f476f8870f48 100644 (file)
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -1609,7 +1609,6 @@ static int process_pure_responses(struct adapter *adapter)
 int t1_poll(struct napi_struct *napi, int budget)
 {
        struct adapter *adapter = container_of(napi, struct adapter, napi);
-       struct net_device *dev = adapter->port[0].dev;
        int work_done = process_responses(adapter, budget);
 
        if (likely(work_done < budget)) {
@@ -1627,8 +1626,6 @@ irqreturn_t t1_interrupt(int irq, void *data)
        int handled;
 
        if (likely(responses_pending(adapter))) {
-               struct net_device *dev = sge->netdev;
-
                writel(F_PL_INTR_SGE_DATA, adapter->regs + A_PL_CAUSE);
 
                if (napi_schedule_prep(&adapter->napi)) {

diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 679125b3bbc9c44210f4026b867aa791eec10d36..eee28d3956827cb8dcb3951df9738ab6c9cd54e6 100644 (file)
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1742,7 +1742,6 @@ static int
 ixgb_clean(struct napi_struct *napi, int budget)
 {
        struct ixgb_adapter *adapter = container_of(napi, struct ixgb_adapter, napi);
-       struct net_device *netdev = adapter->netdev;
        int work_done = 0;
 
        ixgb_clean_tx_irq(adapter);

diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 2da3ce17b981916cb12294c39f045eaeeb0f4b80..5e70180bf5693bdf0096164c8bb26b9bf23d3634 100644 (file)
--- 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)
 {
        struct myri10ge_slice_state *ss =
            container_of(napi, struct myri10ge_slice_state, napi);
-       struct net_device *netdev = ss->mgp->dev;
        int work_done;
 
 #ifdef CONFIG_MYRI10GE_DCA

diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 33e8e62b450212f281cc9e6e641a73ea12d1e492..189ec29ac7a40678787ed8eb3706257268a28e6f 100644 (file)
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -2284,7 +2284,6 @@ static int ql_tx_rx_clean(struct ql3_adapter *qdev,
 static int ql_poll(struct napi_struct *napi, int budget)
 {
        struct ql3_adapter *qdev = container_of(napi, struct ql3_adapter, napi);
-       struct net_device *ndev = qdev->ndev;
        int rx_cleaned = 0, tx_cleaned = 0;
        unsigned long hw_flags;
        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 4070d53c94aabcd15805ef285c9a8436be6acedb..718a7bd0cd1a207f90a6aaf92ffe894fd5163d79 100644 (file)
--- 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)
 static irqreturn_t qlge_msix_rx_isr(int irq, void *dev_id)
 {
        struct rx_ring *rx_ring = dev_id;
-       struct ql_adapter *qdev = rx_ring->qdev;
        netif_rx_schedule(&rx_ring->napi);
        return IRQ_HANDLED;
 }

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 748b4cb3a58a84013faf529ba79bf06328b50b33..f5c57c059bca15c7d9e35f0b26c39fb0551bc718 100644 (file)
--- 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;

diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 5cc59e654d775962bb6599ab9f3ef06db3a81133..7673fd92eaf5f15f413ecd50d56f914d5de078c7 100644 (file)
--- 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)
 {
        struct efx_channel *channel =
                container_of(napi, struct efx_channel, napi_str);
-       struct net_device *napi_dev = channel->napi_dev;
        int rx_packets;
 
        EFX_TRACE(channel->efx, "channel %d NAPI poll executing on CPU %d\n",