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

Commit a8d2a0c2 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

igb: rename phy ops 



This patch renames write_phy_reg to write_reg and read_phy_reg to read_reg.
It seems redundant to call out phy in an operation that is part of the
phy_ops struct.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40a70b38

drivers/net/igb/e1000_82575.c

+19 −19
Original line number Diff line number Diff line
@@ -179,13 +179,13 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) 


	/* PHY function pointers */

	if (igb_sgmii_active_82575(hw)) {

		phy->ops.reset_phy          = igb_phy_hw_reset_sgmii_82575;

		phy->ops.read_phy_reg       = igb_read_phy_reg_sgmii_82575;

		phy->ops.write_phy_reg      = igb_write_phy_reg_sgmii_82575;

		phy->ops.reset              = igb_phy_hw_reset_sgmii_82575;

		phy->ops.read_reg           = igb_read_phy_reg_sgmii_82575;

		phy->ops.write_reg          = igb_write_phy_reg_sgmii_82575;

	} else {

		phy->ops.reset_phy          = igb_phy_hw_reset;

		phy->ops.read_phy_reg       = igb_read_phy_reg_igp;

		phy->ops.write_phy_reg      = igb_write_phy_reg_igp;

		phy->ops.reset              = igb_phy_hw_reset;

		phy->ops.read_reg           = igb_read_phy_reg_igp;

		phy->ops.write_reg          = igb_write_phy_reg_igp;

	}



	/* Set phy->phy_addr and phy->id. */
@@ -435,7 +435,7 @@ static s32 igb_phy_hw_reset_sgmii_82575(struct e1000_hw *hw) 
	 * SFP documentation requires the following to configure the SPF module

	 * to work on SGMII.  No further documentation is given.

	 */

	ret_val = hw->phy.ops.write_phy_reg(hw, 0x1B, 0x8084);

	ret_val = hw->phy.ops.write_reg(hw, 0x1B, 0x8084);

	if (ret_val)

		goto out;
@@ -464,28 +464,28 @@ static s32 igb_set_d0_lplu_state_82575(struct e1000_hw *hw, bool active) 
	s32 ret_val;

	u16 data;



	ret_val = phy->ops.read_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT, &data);

	ret_val = phy->ops.read_reg(hw, IGP02E1000_PHY_POWER_MGMT, &data);

	if (ret_val)

		goto out;



	if (active) {

		data |= IGP02E1000_PM_D0_LPLU;

		ret_val = phy->ops.write_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT,

		ret_val = phy->ops.write_reg(hw, IGP02E1000_PHY_POWER_MGMT,

						 data);

		if (ret_val)

			goto out;



		/* When LPLU is enabled, we should disable SmartSpeed */

		ret_val = phy->ops.read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,

		ret_val = phy->ops.read_reg(hw, IGP01E1000_PHY_PORT_CONFIG,

						&data);

		data &= ~IGP01E1000_PSCFR_SMART_SPEED;

		ret_val = phy->ops.write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,

		ret_val = phy->ops.write_reg(hw, IGP01E1000_PHY_PORT_CONFIG,

						 data);

		if (ret_val)

			goto out;

	} else {

		data &= ~IGP02E1000_PM_D0_LPLU;

		ret_val = phy->ops.write_phy_reg(hw, IGP02E1000_PHY_POWER_MGMT,

		ret_val = phy->ops.write_reg(hw, IGP02E1000_PHY_POWER_MGMT,

						 data);

		/*

		 * LPLU and SmartSpeed are mutually exclusive.  LPLU is used
@@ -494,24 +494,24 @@ static s32 igb_set_d0_lplu_state_82575(struct e1000_hw *hw, bool active) 
		 * SmartSpeed, so performance is maintained.

		 */

		if (phy->smart_speed == e1000_smart_speed_on) {

			ret_val = phy->ops.read_phy_reg(hw,

			ret_val = phy->ops.read_reg(hw,

					IGP01E1000_PHY_PORT_CONFIG, &data);

			if (ret_val)

				goto out;



			data |= IGP01E1000_PSCFR_SMART_SPEED;

			ret_val = phy->ops.write_phy_reg(hw,

			ret_val = phy->ops.write_reg(hw,

					IGP01E1000_PHY_PORT_CONFIG, data);

			if (ret_val)

				goto out;

		} else if (phy->smart_speed == e1000_smart_speed_off) {

			ret_val = phy->ops.read_phy_reg(hw,

			ret_val = phy->ops.read_reg(hw,

					IGP01E1000_PHY_PORT_CONFIG, &data);

			if (ret_val)

				goto out;



			data &= ~IGP01E1000_PSCFR_SMART_SPEED;

			ret_val = phy->ops.write_phy_reg(hw,

			ret_val = phy->ops.write_reg(hw,

					IGP01E1000_PHY_PORT_CONFIG, data);

			if (ret_val)

				goto out;
@@ -1035,7 +1035,7 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw) 
		 * depending on user settings.

		 */

		hw_dbg("Forcing Speed and Duplex\n");

		ret_val = igb_phy_force_speed_duplex(hw);

		ret_val = hw->phy.ops.force_speed_duplex(hw);

		if (ret_val) {

			hw_dbg("Error Forcing Speed and Duplex\n");

			goto out;
@@ -1423,9 +1423,9 @@ static struct e1000_mac_operations e1000_mac_ops_82575 = { 
};



static struct e1000_phy_operations e1000_phy_ops_82575 = {

	.acquire_phy          = igb_acquire_phy_82575,

	.acquire              = igb_acquire_phy_82575,

	.get_cfg_done         = igb_get_cfg_done_82575,

	.release_phy          = igb_release_phy_82575,

	.release              = igb_release_phy_82575,

};



static struct e1000_nvm_operations e1000_nvm_ops_82575 = {

drivers/net/igb/e1000_hw.h

+5 −5
Original line number Diff line number Diff line
@@ -422,18 +422,18 @@ struct e1000_mac_operations { 
};



struct e1000_phy_operations {

	s32  (*acquire_phy)(struct e1000_hw *);

	s32  (*acquire)(struct e1000_hw *);

	s32  (*check_reset_block)(struct e1000_hw *);

	s32  (*force_speed_duplex)(struct e1000_hw *);

	s32  (*get_cfg_done)(struct e1000_hw *hw);

	s32  (*get_cable_length)(struct e1000_hw *);

	s32  (*get_phy_info)(struct e1000_hw *);

	s32  (*read_phy_reg)(struct e1000_hw *, u32, u16 *);

	void (*release_phy)(struct e1000_hw *);

	s32  (*reset_phy)(struct e1000_hw *);

	s32  (*read_reg)(struct e1000_hw *, u32, u16 *);

	void (*release)(struct e1000_hw *);

	s32  (*reset)(struct e1000_hw *);

	s32  (*set_d0_lplu_state)(struct e1000_hw *, bool);

	s32  (*set_d3_lplu_state)(struct e1000_hw *, bool);

	s32  (*write_phy_reg)(struct e1000_hw *, u32, u16);

	s32  (*write_reg)(struct e1000_hw *, u32, u16);

};



struct e1000_nvm_operations {

drivers/net/igb/e1000_mac.c

+4 −4
Original line number Diff line number Diff line
@@ -707,11 +707,11 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw) 
		 * has completed.  We read this twice because this reg has

		 * some "sticky" (latched) bits.

		 */

		ret_val = hw->phy.ops.read_phy_reg(hw, PHY_STATUS,

		ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS,

						   &mii_status_reg);

		if (ret_val)

			goto out;

		ret_val = hw->phy.ops.read_phy_reg(hw, PHY_STATUS,

		ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS,

						   &mii_status_reg);

		if (ret_val)

			goto out;
@@ -729,11 +729,11 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw) 
		 * Page Ability Register (Address 5) to determine how

		 * flow control was negotiated.

		 */

		ret_val = hw->phy.ops.read_phy_reg(hw, PHY_AUTONEG_ADV,

		ret_val = hw->phy.ops.read_reg(hw, PHY_AUTONEG_ADV,

					    &mii_nway_adv_reg);

		if (ret_val)

			goto out;

		ret_val = hw->phy.ops.read_phy_reg(hw, PHY_LP_ABILITY,

		ret_val = hw->phy.ops.read_reg(hw, PHY_LP_ABILITY,

					    &mii_nway_lp_ability_reg);

		if (ret_val)

			goto out;

drivers/net/igb/e1000_phy.c

+128 −219

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/igb/e1000_phy.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ enum e1000_smart_speed { 
s32  igb_check_downshift(struct e1000_hw *hw);

s32  igb_check_reset_block(struct e1000_hw *hw);

s32  igb_copper_link_autoneg(struct e1000_hw *hw);

s32  igb_phy_force_speed_duplex(struct e1000_hw *hw);

s32  igb_copper_link_setup_igp(struct e1000_hw *hw);

s32  igb_copper_link_setup_m88(struct e1000_hw *hw);

s32  igb_phy_force_speed_duplex_igp(struct e1000_hw *hw);