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

Commit ec796b4f authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Garzik
Browse files

igb: remove three redundant functions left in the code 



Three functions were left in the code that are no longer used.  I am removing
these functions just to keep the code clean.

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 avatarJeff Garzik <jgarzik@redhat.com>
parent 549bdd84

drivers/net/igb/e1000_82575.c

+0 −64
Original line number Original line Diff line number Diff line
@@ -1237,70 +1237,6 @@ static bool igb_sgmii_active_82575(struct e1000_hw *hw) 
	return ret_val;

	return ret_val;

}

}





/**

 *  igb_translate_register_82576 - Translate the proper register offset

 *  @reg: e1000 register to be read

 *

 *  Registers in 82576 are located in different offsets than other adapters

 *  even though they function in the same manner.  This function takes in

 *  the name of the register to read and returns the correct offset for

 *  82576 silicon.

 **/

u32 igb_translate_register_82576(u32 reg)

{

	/*

	 * Some of the 82576 registers are located at different

	 * offsets than they are in older adapters.

	 * Despite the difference in location, the registers

	 * function in the same manner.

	 */

	switch (reg) {

	case E1000_TDBAL(0):

		reg = 0x0E000;

		break;

	case E1000_TDBAH(0):

		reg = 0x0E004;

		break;

	case E1000_TDLEN(0):

		reg = 0x0E008;

		break;

	case E1000_TDH(0):

		reg = 0x0E010;

		break;

	case E1000_TDT(0):

		reg = 0x0E018;

		break;

	case E1000_TXDCTL(0):

		reg = 0x0E028;

		break;

	case E1000_RDBAL(0):

		reg = 0x0C000;

		break;

	case E1000_RDBAH(0):

		reg = 0x0C004;

		break;

	case E1000_RDLEN(0):

		reg = 0x0C008;

		break;

	case E1000_RDH(0):

		reg = 0x0C010;

		break;

	case E1000_RDT(0):

		reg = 0x0C018;

		break;

	case E1000_RXDCTL(0):

		reg = 0x0C028;

		break;

	case E1000_SRRCTL(0):

		reg = 0x0C00C;

		break;

	default:

		break;

	}



	return reg;

}



/**

/**

 *  igb_reset_init_script_82575 - Inits HW defaults after reset

 *  igb_reset_init_script_82575 - Inits HW defaults after reset

 *  @hw: pointer to the HW structure

 *  @hw: pointer to the HW structure

drivers/net/igb/e1000_82575.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ 
#ifndef _E1000_82575_H_

#ifndef _E1000_82575_H_

#define _E1000_82575_H_

#define _E1000_82575_H_





u32 igb_translate_register_82576(u32 reg);

void igb_update_mc_addr_list_82575(struct e1000_hw*, u8*, u32, u32, u32);

void igb_update_mc_addr_list_82575(struct e1000_hw*, u8*, u32, u32, u32);

extern void igb_shutdown_fiber_serdes_link_82575(struct e1000_hw *hw);

extern void igb_shutdown_fiber_serdes_link_82575(struct e1000_hw *hw);

extern void igb_rx_fifo_flush_82575(struct e1000_hw *hw);

extern void igb_rx_fifo_flush_82575(struct e1000_hw *hw);

drivers/net/igb/e1000_mac.c

+0 −82
Original line number Original line Diff line number Diff line
@@ -143,34 +143,6 @@ void igb_write_vfta(struct e1000_hw *hw, u32 offset, u32 value) 
	wrfl();

	wrfl();

}

}





/**

 *  igb_init_rx_addrs - Initialize receive address's

 *  @hw: pointer to the HW structure

 *  @rar_count: receive address registers

 *

 *  Setups the receive address registers by setting the base receive address

 *  register to the devices MAC address and clearing all the other receive

 *  address registers to 0.

 **/

void igb_init_rx_addrs(struct e1000_hw *hw, u16 rar_count)

{

	u32 i;



	/* Setup the receive address */

	hw_dbg("Programming MAC Address into RAR[0]\n");



	hw->mac.ops.rar_set(hw, hw->mac.addr, 0);



	/* Zero out the other (rar_entry_count - 1) receive addresses */

	hw_dbg("Clearing RAR[1-%u]\n", rar_count-1);

	for (i = 1; i < rar_count; i++) {

		array_wr32(E1000_RA, (i << 1), 0);

		wrfl();

		array_wr32(E1000_RA, ((i << 1) + 1), 0);

		wrfl();

	}

}



/**

/**

 *  igb_check_alt_mac_addr - Check for alternate MAC addr

 *  igb_check_alt_mac_addr - Check for alternate MAC addr

 *  @hw: pointer to the HW structure

 *  @hw: pointer to the HW structure
@@ -296,60 +268,6 @@ void igb_mta_set(struct e1000_hw *hw, u32 hash_value) 
	wrfl();

	wrfl();

}

}





/**

 *  igb_update_mc_addr_list - Update Multicast addresses

 *  @hw: pointer to the HW structure

 *  @mc_addr_list: array of multicast addresses to program

 *  @mc_addr_count: number of multicast addresses to program

 *  @rar_used_count: the first RAR register free to program

 *  @rar_count: total number of supported Receive Address Registers

 *

 *  Updates the Receive Address Registers and Multicast Table Array.

 *  The caller must have a packed mc_addr_list of multicast addresses.

 *  The parameter rar_count will usually be hw->mac.rar_entry_count

 *  unless there are workarounds that change this.

 **/

void igb_update_mc_addr_list(struct e1000_hw *hw,

			       u8 *mc_addr_list, u32 mc_addr_count,

			       u32 rar_used_count, u32 rar_count)

{

	u32 hash_value;

	u32 i;



	/*

	 * Load the first set of multicast addresses into the exact

	 * filters (RAR).  If there are not enough to fill the RAR

	 * array, clear the filters.

	 */

	for (i = rar_used_count; i < rar_count; i++) {

		if (mc_addr_count) {

			hw->mac.ops.rar_set(hw, mc_addr_list, i);

			mc_addr_count--;

			mc_addr_list += ETH_ALEN;

		} else {

			array_wr32(E1000_RA, i << 1, 0);

			wrfl();

			array_wr32(E1000_RA, (i << 1) + 1, 0);

			wrfl();

		}

	}



	/* Clear the old settings from the MTA */

	hw_dbg("Clearing MTA\n");

	for (i = 0; i < hw->mac.mta_reg_count; i++) {

		array_wr32(E1000_MTA, i, 0);

		wrfl();

	}



	/* Load any remaining multicast addresses into the hash table. */

	for (; mc_addr_count > 0; mc_addr_count--) {

		hash_value = igb_hash_mc_addr(hw, mc_addr_list);

		hw_dbg("Hash value = 0x%03X\n", hash_value);

		igb_mta_set(hw, hash_value);

		mc_addr_list += ETH_ALEN;

	}

}



/**

/**

 *  igb_hash_mc_addr - Generate a multicast hash value

 *  igb_hash_mc_addr - Generate a multicast hash value

 *  @hw: pointer to the HW structure

 *  @hw: pointer to the HW structure

drivers/net/igb/e1000_mac.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -51,9 +51,6 @@ s32 igb_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed, 
				       u16 *duplex);

				       u16 *duplex);

s32  igb_id_led_init(struct e1000_hw *hw);

s32  igb_id_led_init(struct e1000_hw *hw);

s32  igb_led_off(struct e1000_hw *hw);

s32  igb_led_off(struct e1000_hw *hw);

void igb_update_mc_addr_list(struct e1000_hw *hw,

			       u8 *mc_addr_list, u32 mc_addr_count,

			       u32 rar_used_count, u32 rar_count);

s32  igb_setup_link(struct e1000_hw *hw);

s32  igb_setup_link(struct e1000_hw *hw);

s32  igb_validate_mdi_setting(struct e1000_hw *hw);

s32  igb_validate_mdi_setting(struct e1000_hw *hw);

s32  igb_write_8bit_ctrl_reg(struct e1000_hw *hw, u32 reg,

s32  igb_write_8bit_ctrl_reg(struct e1000_hw *hw, u32 reg,
@@ -62,7 +59,6 @@ s32 igb_write_8bit_ctrl_reg(struct e1000_hw *hw, u32 reg, 
void igb_clear_hw_cntrs_base(struct e1000_hw *hw);

void igb_clear_hw_cntrs_base(struct e1000_hw *hw);

void igb_clear_vfta(struct e1000_hw *hw);

void igb_clear_vfta(struct e1000_hw *hw);

void igb_config_collision_dist(struct e1000_hw *hw);

void igb_config_collision_dist(struct e1000_hw *hw);

void igb_init_rx_addrs(struct e1000_hw *hw, u16 rar_count);

void igb_mta_set(struct e1000_hw *hw, u32 hash_value);

void igb_mta_set(struct e1000_hw *hw, u32 hash_value);

void igb_put_hw_semaphore(struct e1000_hw *hw);

void igb_put_hw_semaphore(struct e1000_hw *hw);

void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);

void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);

drivers/net/igb/e1000_regs.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -262,9 +262,6 @@ 
#define E1000_RETA(_i)  (0x05C00 + ((_i) * 4))

#define E1000_RETA(_i)  (0x05C00 + ((_i) * 4))

#define E1000_RSSRK(_i) (0x05C80 + ((_i) * 4)) /* RSS Random Key - RW Array */

#define E1000_RSSRK(_i) (0x05C80 + ((_i) * 4)) /* RSS Random Key - RW Array */





#define E1000_REGISTER(a, reg) (((a)->mac.type < e1000_82576) \

                               ? reg : e1000_translate_register_82576(reg))



#define wr32(reg, value) (writel(value, hw->hw_addr + reg))

#define wr32(reg, value) (writel(value, hw->hw_addr + reg))

#define rd32(reg) (readl(hw->hw_addr + reg))

#define rd32(reg) (readl(hw->hw_addr + reg))

#define wrfl() ((void)rd32(E1000_STATUS))

#define wrfl() ((void)rd32(E1000_STATUS))