e1000: checkpatch clean (b1184020) · Commits · 戴 / test

drivers/net/e1000/e1000.h

+20 −14

Original line number	Diff line number	Diff line
		@@ -90,10 +90,13 @@ struct e1000_adapter;
		#define E1000_ERR(args...) printk(KERN_ERR "e1000: " args)

		#define PFX "e1000: "

		#define DPRINTK(nlevel, klevel, fmt, args...) \
		(void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \
		printk(KERN_##klevel PFX "%s: %s: " fmt, adapter->netdev->name, \
		__FUNCTION__ , ## args))
		do { \
		if (NETIF_MSG_##nlevel & adapter->msg_enable) \
		printk(KERN_##klevel PFX "%s: %s: " fmt, \
		adapter->netdev->name, __func__, ##args); \
		} while (0)

		#define E1000_MAX_INTR 10

		@@ -151,9 +154,9 @@ struct e1000_adapter;
		#define E1000_MASTER_SLAVE e1000_ms_hw_default
		#endif

		#define E1000_MNG_VLAN_NONE -1
		#define E1000_MNG_VLAN_NONE (-1)
		/* Number of packet split data buffers (not including the header buffer) */
		#define PS_PAGE_BUFFERS MAX_PS_BUFFERS-1
		#define PS_PAGE_BUFFERS (MAX_PS_BUFFERS - 1)

		/* wrapper around a pointer to a socket buffer,
		* so a DMA handle can be stored along with the buffer */
		@@ -165,9 +168,13 @@ struct e1000_buffer {
		u16 next_to_watch;
		};

		struct e1000_ps_page {
		struct page *ps_page[PS_PAGE_BUFFERS];
		};

		struct e1000_ps_page { struct page *ps_page[PS_PAGE_BUFFERS]; };
		struct e1000_ps_page_dma { u64 ps_page_dma[PS_PAGE_BUFFERS]; };
		struct e1000_ps_page_dma {
		u64 ps_page_dma[PS_PAGE_BUFFERS];
		};

		struct e1000_tx_ring {
		/* pointer to the descriptor ring memory */
		@@ -218,8 +225,8 @@ struct e1000_rx_ring {
		};

		#define E1000_DESC_UNUSED(R) \
		((((R)->next_to_clean > (R)->next_to_use) ? 0 : (R)->count) + \
		(R)->next_to_clean - (R)->next_to_use - 1)
		((((R)->next_to_clean > (R)->next_to_use) \
		? 0 : (R)->count) + (R)->next_to_clean - (R)->next_to_use - 1)

		#define E1000_RX_DESC_PS(R, i) \
		(&(((union e1000_rx_desc_packet_split *)((R).desc))[i]))
		@@ -317,7 +324,6 @@ struct e1000_adapter {
		u64 gorcl_old;
		u16 rx_ps_bsize0;


		/* OS defined structs */
		struct net_device *netdev;
		struct pci_dev *pdev;

Admin message