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

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

e1000e: cleanup some whitespace and indentation 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 c063f606

drivers/net/ethernet/intel/e1000e/82571.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -1328,7 +1328,8 @@ static void e1000_clear_vfta_82571(struct e1000_hw *hw) 
			vfta_offset = (hw->mng_cookie.vlan_id >>

			vfta_offset = (hw->mng_cookie.vlan_id >>

				       E1000_VFTA_ENTRY_SHIFT) &

				       E1000_VFTA_ENTRY_SHIFT) &

			    E1000_VFTA_ENTRY_MASK;

			    E1000_VFTA_ENTRY_MASK;

			vfta_bit_in_reg = 1 << (hw->mng_cookie.vlan_id &

			vfta_bit_in_reg =

			    1 << (hw->mng_cookie.vlan_id &

				  E1000_VFTA_ENTRY_BIT_SHIFT_MASK);

				  E1000_VFTA_ENTRY_BIT_SHIFT_MASK);

		}

		}

		break;

		break;

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

+24 −23
Original line number Original line Diff line number Diff line
@@ -253,11 +253,12 @@ 
#define ADVERTISE_1000_FULL               0x0020

#define ADVERTISE_1000_FULL               0x0020





/* 1000/H is not supported, nor spec-compliant. */

/* 1000/H is not supported, nor spec-compliant. */

#define E1000_ALL_SPEED_DUPLEX ( ADVERTISE_10_HALF |   ADVERTISE_10_FULL | \

#define E1000_ALL_SPEED_DUPLEX	( \

				ADVERTISE_100_HALF |  ADVERTISE_100_FULL | \

	ADVERTISE_10_HALF | ADVERTISE_10_FULL | ADVERTISE_100_HALF | \

						     ADVERTISE_1000_FULL)

	ADVERTISE_100_FULL | ADVERTISE_1000_FULL)

#define E1000_ALL_NOT_GIG      ( ADVERTISE_10_HALF |   ADVERTISE_10_FULL | \

#define E1000_ALL_NOT_GIG	( \

				ADVERTISE_100_HALF |  ADVERTISE_100_FULL)

	ADVERTISE_10_HALF | ADVERTISE_10_FULL | ADVERTISE_100_HALF | \

	ADVERTISE_100_FULL)

#define E1000_ALL_100_SPEED	(ADVERTISE_100_HALF | ADVERTISE_100_FULL)

#define E1000_ALL_100_SPEED	(ADVERTISE_100_HALF | ADVERTISE_100_FULL)

#define E1000_ALL_10_SPEED	(ADVERTISE_10_HALF | ADVERTISE_10_FULL)

#define E1000_ALL_10_SPEED	(ADVERTISE_10_HALF | ADVERTISE_10_FULL)

#define E1000_ALL_HALF_DUPLEX	(ADVERTISE_10_HALF | ADVERTISE_100_HALF)

#define E1000_ALL_HALF_DUPLEX	(ADVERTISE_10_HALF | ADVERTISE_100_HALF)

drivers/net/ethernet/intel/e1000e/mac.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1074,8 +1074,8 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw) 
		ret_val = e1e_rphy(hw, PHY_AUTONEG_ADV, &mii_nway_adv_reg);

		ret_val = e1e_rphy(hw, PHY_AUTONEG_ADV, &mii_nway_adv_reg);

		if (ret_val)

		if (ret_val)

			return ret_val;

			return ret_val;

		ret_val =

		ret_val = e1e_rphy(hw, PHY_LP_ABILITY,

		    e1e_rphy(hw, PHY_LP_ABILITY, &mii_nway_lp_ability_reg);

				   &mii_nway_lp_ability_reg);

		if (ret_val)

		if (ret_val)

			return ret_val;

			return ret_val;

drivers/net/ethernet/intel/e1000e/param.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -53,8 +53,7 @@ MODULE_PARM_DESC(copybreak, 
 */

 */

#define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }

#define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }

#define E1000_PARAM(X, desc)					\

#define E1000_PARAM(X, desc)					\

	static int X[E1000_MAX_NIC+1]		\

	static int X[E1000_MAX_NIC+1] = E1000_PARAM_INIT;	\

		= E1000_PARAM_INIT;				\

	static unsigned int num_##X;				\

	static unsigned int num_##X;				\

	module_param_array_named(X, X, int, &num_##X, 0);	\

	module_param_array_named(X, X, int, &num_##X, 0);	\

	MODULE_PARM_DESC(X, desc);

	MODULE_PARM_DESC(X, desc);

drivers/net/ethernet/intel/e1000e/80003es2lan.c

+11 −11

File changed.

Contains only whitespace changes.

drivers/net/ethernet/intel/e1000e/ich8lan.c

+2 −2

File changed.

Contains only whitespace changes.

drivers/net/ethernet/intel/e1000e/netdev.c

+2 −2

File changed.

Contains only whitespace changes.