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

Commit c6cdf436 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Whitespace, constant, and comment updates 



This patch fixes whitespace errors, preprocessor definition placement
oddities and updates comments.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Reviewed-by: default avatarBenjamin Li <benli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 184b8904

drivers/net/tg3.c

+37 −35
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ 
#define TG3_RX_JMB_BUFF_RING_SIZE \

	(sizeof(struct ring_info) * TG3_RX_JUMBO_RING_SIZE)



#define TG3_RSS_MIN_NUM_MSIX_VECS	2



/* minimum number of free TX descriptors required to wake up TX process */

#define TG3_TX_WAKEUP_THRESH(tnapi)		((tnapi)->tx_pending / 4)
@@ -152,6 +154,8 @@ 


#define TG3_NUM_TEST		6



#define TG3_FW_UPDATE_TIMEOUT_SEC	5



#define FIRMWARE_TG3		"tigon/tg3.bin"

#define FIRMWARE_TG3TSO		"tigon/tg3_tso.bin"

#define FIRMWARE_TG3TSO5	"tigon/tg3_tso5.bin"
@@ -167,8 +171,6 @@ MODULE_FIRMWARE(FIRMWARE_TG3); 
MODULE_FIRMWARE(FIRMWARE_TG3TSO);

MODULE_FIRMWARE(FIRMWARE_TG3TSO5);



#define TG3_RSS_MIN_NUM_MSIX_VECS	2



static int tg3_debug = -1;	/* -1 == use TG3_DEF_MSG_ENABLE as value */

module_param(tg3_debug, int, 0);

MODULE_PARM_DESC(tg3_debug, "Tigon3 bitmapped debugging message enable value");
@@ -651,6 +653,7 @@ static void tg3_enable_ints(struct tg3 *tp) 
	tp->coal_now = tp->coalesce_mode | HOSTCC_MODE_ENABLE;

	for (i = 0; i < tp->irq_cnt; i++) {

		struct tg3_napi *tnapi = &tp->napi[i];



		tw32_mailbox_f(tnapi->int_mbox, tnapi->last_tag << 24);

		if (tp->tg3_flags2 & TG3_FLG2_1SHOT_MSI)

			tw32_mailbox_f(tnapi->int_mbox, tnapi->last_tag << 24);
@@ -4211,6 +4214,7 @@ static void tg3_serdes_parallel_detect(struct tg3 *tp) 
		tp->serdes_counter--;

		return;

	}



	if (!netif_carrier_ok(tp->dev) &&

	    (tp->link_config.autoneg == AUTONEG_ENABLE)) {

		u32 bmcr;
@@ -4519,8 +4523,8 @@ static void tg3_recycle_rx(struct tg3_napi *tnapi, 
	struct tg3 *tp = tnapi->tp;

	struct tg3_rx_buffer_desc *src_desc, *dest_desc;

	struct ring_info *src_map, *dest_map;

	int dest_idx;

	struct tg3_rx_prodring_set *spr = &tp->prodring[0];

	int dest_idx;



	switch (opaque_key) {

	case RXD_OPAQUE_RING_STD:
@@ -4981,7 +4985,7 @@ static int tg3_poll_msix(struct napi_struct *napi, int budget) 
		if (unlikely(work_done >= budget))

			break;



		/* tp->last_tag is used in tg3_restart_ints() below

		/* tp->last_tag is used in tg3_int_reenable() below

		 * to tell the hw how much work has been processed,

		 * so we must read it before checking for more work.

		 */
@@ -5496,7 +5500,6 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, 
	struct netdev_queue *txq;

	unsigned int i, last;





	txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb));

	tnapi = &tp->napi[skb_get_queue_mapping(skb)];

	if (tp->tg3_flags3 & TG3_FLG3_ENABLE_TSS)
@@ -5700,7 +5703,6 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb, 
	struct netdev_queue *txq;

	unsigned int i, last;





	txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb));

	tnapi = &tp->napi[skb_get_queue_mapping(skb)];

	if (tp->tg3_flags3 & TG3_FLG3_ENABLE_TSS)
@@ -6013,7 +6015,7 @@ static void tg3_rx_prodring_free(struct tg3 *tp, 
	}

}



/* Initialize tx/rx rings for packet processing.

/* Initialize rx rings for packet processing.

 *

 * The chip has been shut down and the driver detached from

 * the networking, so no interrupts or new tx packets will
@@ -8491,8 +8493,8 @@ static void tg3_timer(unsigned long __opaque) 
			tg3_write_mem(tp, NIC_SRAM_FW_CMD_MBOX,

				      FWCMD_NICDRV_ALIVE3);

			tg3_write_mem(tp, NIC_SRAM_FW_CMD_LEN_MBOX, 4);

			/* 5 seconds timeout */

			tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX, 5);

			tg3_write_mem(tp, NIC_SRAM_FW_CMD_DATA_MBOX,

				      TG3_FW_UPDATE_TIMEOUT_SEC);



			tg3_generate_fw_event(tp);

		}
@@ -12003,7 +12005,7 @@ static int tg3_nvram_write_block_buffered(struct tg3 *tp, u32 offset, u32 len, 


		nvram_cmd = NVRAM_CMD_GO | NVRAM_CMD_DONE | NVRAM_CMD_WR;



	        if ((page_off == 0) || (i == 0))

		if (page_off == 0 || i == 0)

			nvram_cmd |= NVRAM_CMD_FIRST;

		if (page_off == (tp->nvram_pagesize - 4))

			nvram_cmd |= NVRAM_CMD_LAST;

drivers/net/tg3.h

+3 −3
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ 
/* 0x94 --> 0x98 unused */

#define TG3PCI_STD_RING_PROD_IDX	0x00000098 /* 64-bit */

#define TG3PCI_RCV_RET_RING_CON_IDX	0x000000a0 /* 64-bit */

/* 0xa0 --> 0xb8 unused */

/* 0xa8 --> 0xb8 unused */

#define TG3PCI_DUAL_MAC_CTRL		0x000000b8

#define  DUAL_MAC_CTRL_CH_MASK		 0x00000003

#define  DUAL_MAC_CTRL_ID		 0x00000004