Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d5451d2 authored by David S. Miller's avatar David S. Miller
Browse files

net: Fix warning fallout from recent NAPI interface changes. 



When we removed the network device argument from several
NAPI interfaces in 908a7a16
("net: Remove unused netdev arg from some NAPI interfaces.")
several drivers now started getting unused variable warnings.

This fixes those up.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0da2afd5

drivers/infiniband/hw/nes/nes_nic.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/atl1e/atl1e_main.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/b44.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/bnx2x_main.c

+0 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/net/chelsio/sge.c

+0 −3
Original line number Diff line number Diff line
@@ -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)) {