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

Commit a9bb6290 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: cleanup hw.h 



Remove unnecessary #include, forward prototype of struct e1000_adapter and
an empty comment; fix a comment which mentions "static data for the MAC"
which is not applicable to the following struct; and cleanup some
whitespace issues.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 41c7d9c9

drivers/net/ethernet/intel/e1000e/hw.h

+10 −15
Original line number Diff line number Diff line
@@ -29,12 +29,9 @@ 
#ifndef _E1000_HW_H_

#define _E1000_HW_H_



#include <linux/types.h>

#include "defines.h"



struct e1000_hw;

struct e1000_adapter;



#include "defines.h"



enum e1e_registers {

	E1000_CTRL     = 0x00000, /* Device Control - RW */
@@ -392,12 +389,10 @@ enum e1e_registers { 
#define E1000_DEV_ID_82574L			0x10D3

#define E1000_DEV_ID_82574LA			0x10F6

#define E1000_DEV_ID_82583V			0x150C



#define E1000_DEV_ID_80003ES2LAN_COPPER_DPT	0x1096

#define E1000_DEV_ID_80003ES2LAN_SERDES_DPT	0x1098

#define E1000_DEV_ID_80003ES2LAN_COPPER_SPT	0x10BA

#define E1000_DEV_ID_80003ES2LAN_SERDES_SPT	0x10BB



#define E1000_DEV_ID_ICH8_82567V_3		0x1501

#define E1000_DEV_ID_ICH8_IGP_M_AMT		0x1049

#define E1000_DEV_ID_ICH8_IGP_AMT		0x104A
@@ -664,7 +659,7 @@ struct e1000_data_desc { 
		struct {

			u8 status;     /* Descriptor status */

			u8 popts;      /* Packet Options */

			__le16 special;   /* */

			__le16 special;

		} fields;

	} upper;

};
@@ -781,7 +776,7 @@ struct e1000_host_mng_command_info { 
	u8 command_data[E1000_HI_MAX_MNG_DATA_LENGTH];

};



/* Function pointers and static data for the MAC. */

/* Function pointers for the MAC. */

struct e1000_mac_operations {

	s32  (*id_led_init)(struct e1000_hw *);

	s32  (*blink_led)(struct e1000_hw *);