Skip to content

Commit

Permalink
net: Fix warning fallout from recent NAPI interface changes.
Browse files Browse the repository at this point in the history
When we removed the network device argument from several
NAPI interfaces in 908a7a1
("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>
  • Loading branch information
David S. Miller committed Dec 26, 2008
1 parent 0da2afd commit 2d5451d
Show file tree
Hide file tree
Showing 11 changed files with 0 additions and 14 deletions.
1 change: 0 additions & 1 deletion drivers/infiniband/hw/nes/nes_nic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion drivers/net/atl1e/atl1e_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/b44.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion drivers/net/bnx2x_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
3 changes: 0 additions & 3 deletions drivers/net/chelsio/sge.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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)) {
Expand Down
1 change: 0 additions & 1 deletion drivers/net/ixgb/ixgb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion drivers/net/myri10ge/myri10ge.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion drivers/net/qla3xxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/qlge/qlge_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/s2io.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/sfc/efx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 2d5451d

Please sign in to comment.