Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 22:50:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: Fix warning fallout from recent NAPI interface changes.

Browse Source 
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>
This commit is contained in:
David S. Miller 2008-12-26 15:10:00 -08:00
parent 0da2afd596
commit 2d5451d261
11 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/infiniband/hw/nes/nes_nic.c
View File

@ -99,7 +99,6 @@ static int nics_per_function = 1;
static int nes_netdev_poll(struct napi_struct *napi, int budget) static int nes_netdev_poll(struct napi_struct *napi, int budget)
{ {
struct nes_vnic *nesvnic = container_of(napi, struct nes_vnic, napi); 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_device *nesdev = nesvnic->nesdev;
struct nes_hw_nic_cq *nescq = &nesvnic->nic_cq; struct nes_hw_nic_cq *nescq = &nesvnic->nic_cq;

1
drivers/net/atl1e/atl1e_main.c
View File

@ -1501,7 +1501,6 @@ static int atl1e_clean(struct napi_struct *napi, int budget)
{ {
struct atl1e_adapter *adapter = struct atl1e_adapter *adapter =
container_of(napi, struct atl1e_adapter, napi); container_of(napi, struct atl1e_adapter, napi);
struct net_device *netdev = adapter->netdev;
struct pci_dev *pdev = adapter->pdev; struct pci_dev *pdev = adapter->pdev;
u32 imr_data; u32 imr_data;
int work_done = 0; int work_done = 0;

1
drivers/net/b44.c
View File

@ -846,7 +846,6 @@ static int b44_rx(struct b44 *bp, int budget)
static int b44_poll(struct napi_struct *napi, int budget) static int b44_poll(struct napi_struct *napi, int budget)
{ {
struct b44 *bp = container_of(napi, struct b44, napi); struct b44 *bp = container_of(napi, struct b44, napi);
struct net_device *netdev = bp->dev;
int work_done; int work_done;
spin_lock_irq(&bp->lock); spin_lock_irq(&bp->lock);

1
drivers/net/bnx2x_main.c
View File

@ -1592,7 +1592,6 @@ static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie)
{ {
struct bnx2x_fastpath *fp = fp_cookie; struct bnx2x_fastpath *fp = fp_cookie;
struct bnx2x *bp = fp->bp; struct bnx2x *bp = fp->bp;
struct net_device *dev = bp->dev;
int index = FP_IDX(fp); int index = FP_IDX(fp);
/* Return here if interrupt is disabled */ /* Return here if interrupt is disabled */

3
drivers/net/chelsio/sge.c
View File

@ -1609,7 +1609,6 @@ static int process_pure_responses(struct adapter *adapter)
int t1_poll(struct napi_struct *napi, int budget) int t1_poll(struct napi_struct *napi, int budget)
{ {
struct adapter *adapter = container_of(napi, struct adapter, napi); struct adapter *adapter = container_of(napi, struct adapter, napi);
struct net_device *dev = adapter->port[0].dev;
int work_done = process_responses(adapter, budget); int work_done = process_responses(adapter, budget);
if (likely(work_done < budget)) { if (likely(work_done < budget)) {
@ -1627,8 +1626,6 @@ irqreturn_t t1_interrupt(int irq, void *data)
int handled; int handled;
if (likely(responses_pending(adapter))) { if (likely(responses_pending(adapter))) {
struct net_device *dev = sge->netdev;
writel(F_PL_INTR_SGE_DATA, adapter->regs + A_PL_CAUSE); writel(F_PL_INTR_SGE_DATA, adapter->regs + A_PL_CAUSE);
if (napi_schedule_prep(&adapter->napi)) { if (napi_schedule_prep(&adapter->napi)) {

1
drivers/net/ixgb/ixgb_main.c
View File

@ -1742,7 +1742,6 @@ static int
ixgb_clean(struct napi_struct *napi, int budget) ixgb_clean(struct napi_struct *napi, int budget)
{ {
struct ixgb_adapter *adapter = container_of(napi, struct ixgb_adapter, napi); struct ixgb_adapter *adapter = container_of(napi, struct ixgb_adapter, napi);
struct net_device *netdev = adapter->netdev;
int work_done = 0; int work_done = 0;
ixgb_clean_tx_irq(adapter); ixgb_clean_tx_irq(adapter);

1
drivers/net/myri10ge/myri10ge.c
View File

@ -1503,7 +1503,6 @@ static int myri10ge_poll(struct napi_struct *napi, int budget)
{ {
struct myri10ge_slice_state *ss = struct myri10ge_slice_state *ss =
container_of(napi, struct myri10ge_slice_state, napi); container_of(napi, struct myri10ge_slice_state, napi);
struct net_device *netdev = ss->mgp->dev;
int work_done; int work_done;
#ifdef CONFIG_MYRI10GE_DCA #ifdef CONFIG_MYRI10GE_DCA

1
drivers/net/qla3xxx.c
View File

@ -2284,7 +2284,6 @@ static int ql_tx_rx_clean(struct ql3_adapter *qdev,
static int ql_poll(struct napi_struct *napi, int budget) static int ql_poll(struct napi_struct *napi, int budget)
{ {
struct ql3_adapter *qdev = container_of(napi, struct ql3_adapter, napi); struct ql3_adapter *qdev = container_of(napi, struct ql3_adapter, napi);
struct net_device *ndev = qdev->ndev;
int rx_cleaned = 0, tx_cleaned = 0; int rx_cleaned = 0, tx_cleaned = 0;
unsigned long hw_flags; unsigned long hw_flags;
struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers; struct ql3xxx_port_registers __iomem *port_regs = qdev->mem_map_registers;

1
drivers/net/qlge/qlge_main.c
View File

@ -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) static irqreturn_t qlge_msix_rx_isr(int irq, void *dev_id)
{ {
struct rx_ring *rx_ring = dev_id; struct rx_ring *rx_ring = dev_id;
struct ql_adapter *qdev = rx_ring->qdev;
netif_rx_schedule(&rx_ring->napi); netif_rx_schedule(&rx_ring->napi);
return IRQ_HANDLED; return IRQ_HANDLED;
} }

2
drivers/net/s2io.c
View File

@ -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 s2io_nic *nic = container_of(napi, struct s2io_nic, napi);
struct ring_info *ring; struct ring_info *ring;
struct net_device *dev = nic->dev;
struct config_param *config; struct config_param *config;
struct mac_info *mac_control; struct mac_info *mac_control;
int pkts_processed = 0; 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 ring_info *ring = (struct ring_info *)dev_id;
struct s2io_nic *sp = ring->nic; struct s2io_nic *sp = ring->nic;
struct XENA_dev_config __iomem *bar0 = sp->bar0; struct XENA_dev_config __iomem *bar0 = sp->bar0;
struct net_device *dev = sp->dev;
if (unlikely(!is_s2io_card_up(sp))) if (unlikely(!is_s2io_card_up(sp)))
return IRQ_HANDLED; return IRQ_HANDLED;

1
drivers/net/sfc/efx.c
View File

@ -216,7 +216,6 @@ static int efx_poll(struct napi_struct *napi, int budget)
{ {
struct efx_channel *channel = struct efx_channel *channel =
container_of(napi, struct efx_channel, napi_str); container_of(napi, struct efx_channel, napi_str);
struct net_device *napi_dev = channel->napi_dev;
int rx_packets; int rx_packets;
EFX_TRACE(channel->efx, "channel %d NAPI poll executing on CPU %d\n", EFX_TRACE(channel->efx, "channel %d NAPI poll executing on CPU %d\n",