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

Commit 86449944 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

tg3: Fix sparse warnings. 



drivers/net/ethernet/broadcom/tg3.c:8121:8: warning: symbol 'i' shadows an earlier one
drivers/net/ethernet/broadcom/tg3.c:8003:6: originally declared here
drivers/net/ethernet/broadcom/tg3.c:785:5: warning: symbol 'tg3_ape_scratchpad_read' was not declared. Should it be static?
drivers/net/ethernet/broadcom/tg3.c:7781:19: warning: Using plain integer as NULL pointer
drivers/net/ethernet/broadcom/tg3.c:10231:31: error: bad constant expression

Reported-by: default avatarFengguang Wu <fenguang.wu@intel.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5316cf9a

drivers/net/ethernet/broadcom/tg3.c

+6 −5
Original line number Diff line number Diff line
@@ -782,7 +782,8 @@ static int tg3_ape_wait_for_event(struct tg3 *tp, u32 timeout_us) 
	return i == timeout_us / 10;

}



int tg3_ape_scratchpad_read(struct tg3 *tp, u32 *data, u32 base_off, u32 len)

static int tg3_ape_scratchpad_read(struct tg3 *tp, u32 *data, u32 base_off,

				   u32 len)

{

	int err;

	u32 i, bufoff, msgoff, maxlen, apedata;
@@ -7763,7 +7764,7 @@ static int tg3_alloc_consistent(struct tg3 *tp) 
		sblk = tnapi->hw_status;



		if (tg3_flag(tp, ENABLE_RSS)) {

			u16 *prodptr = 0;

			u16 *prodptr = NULL;



			/*

			 * When RSS is enabled, the status block format changes
@@ -8103,11 +8104,11 @@ static int tg3_chip_reset(struct tg3 *tp) 
		u16 val16;



		if (tp->pci_chip_rev_id == CHIPREV_ID_5750_A0) {

			int i;

			int j;

			u32 cfg_val;



			/* Wait for link training to complete.  */

			for (i = 0; i < 5000; i++)

			for (j = 0; j < 5000; j++)

				udelay(100);



			pci_read_config_dword(tp->pdev, 0xc4, &cfg_val);
@@ -10206,7 +10207,7 @@ static u32 tg3_irq_count(struct tg3 *tp) 
static bool tg3_enable_msix(struct tg3 *tp)

{

	int i, rc;

	struct msix_entry msix_ent[tp->irq_max];

	struct msix_entry msix_ent[TG3_IRQ_MAX_VECS];



	tp->txq_cnt = tp->txq_req;

	tp->rxq_cnt = tp->rxq_req;