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

Commit 9fa0452b authored by Todd Fujinaka's avatar Todd Fujinaka Committed by Jeff Kirsher
Browse files

igb: use ARRAY_SIZE to replace calculating sizeof(a)/sizeof(a[0]) 



Use the ARRAY_SIZE macro rather than calculating sizeof(a)/sizeof(a[0]).
Also directly replace the code rather than using an unnecessary define.

Reported-by: default avatarManinder Singh <maninder1.s@samsung.com>
Reported-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarTodd Fujinaka <todd.fujinaka@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 0c5bbeb8

drivers/net/ethernet/intel/igb/e1000_phy.c

+5 −11
Original line number Diff line number Diff line 
/* Intel(R) Gigabit Ethernet Linux driver

 * Copyright(c) 2007-2014 Intel Corporation.

 * Copyright(c) 2007-2015 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,
@@ -36,9 +36,6 @@ static s32 igb_set_master_slave_mode(struct e1000_hw *hw); 
/* Cable length tables */

static const u16 e1000_m88_cable_length_table[] = {

	0, 50, 80, 110, 140, 140, E1000_CABLE_LENGTH_UNDEFINED };

#define M88E1000_CABLE_LENGTH_TABLE_SIZE \

	(sizeof(e1000_m88_cable_length_table) / \

	sizeof(e1000_m88_cable_length_table[0]))



static const u16 e1000_igp_2_cable_length_table[] = {

	0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 8, 11, 13, 16, 18, 21,
@@ -49,9 +46,6 @@ static const u16 e1000_igp_2_cable_length_table[] = { 
	60, 66, 72, 77, 82, 87, 92, 96, 100, 104, 108, 111, 114, 117, 119, 121,

	83, 89, 95, 100, 105, 109, 113, 116, 119, 122, 124,

	104, 109, 114, 118, 121, 124};

#define IGP02E1000_CABLE_LENGTH_TABLE_SIZE \

	(sizeof(e1000_igp_2_cable_length_table) / \

	 sizeof(e1000_igp_2_cable_length_table[0]))



/**

 *  igb_check_reset_block - Check if PHY reset is blocked
@@ -1700,7 +1694,7 @@ s32 igb_get_cable_length_m88(struct e1000_hw *hw) 


	index = (phy_data & M88E1000_PSSR_CABLE_LENGTH) >>

		M88E1000_PSSR_CABLE_LENGTH_SHIFT;

	if (index >= M88E1000_CABLE_LENGTH_TABLE_SIZE - 1) {

	if (index >= ARRAY_SIZE(e1000_m88_cable_length_table) - 1) {

		ret_val = -E1000_ERR_PHY;

		goto out;

	}
@@ -1796,7 +1790,7 @@ s32 igb_get_cable_length_m88_gen2(struct e1000_hw *hw) 


		index = (phy_data & M88E1000_PSSR_CABLE_LENGTH) >>

			M88E1000_PSSR_CABLE_LENGTH_SHIFT;

		if (index >= M88E1000_CABLE_LENGTH_TABLE_SIZE - 1) {

		if (index >= ARRAY_SIZE(e1000_m88_cable_length_table) - 1) {

			ret_val = -E1000_ERR_PHY;

			goto out;

		}
@@ -1840,7 +1834,7 @@ s32 igb_get_cable_length_igp_2(struct e1000_hw *hw) 
	s32 ret_val = 0;

	u16 phy_data, i, agc_value = 0;

	u16 cur_agc_index, max_agc_index = 0;

	u16 min_agc_index = IGP02E1000_CABLE_LENGTH_TABLE_SIZE - 1;

	u16 min_agc_index = ARRAY_SIZE(e1000_igp_2_cable_length_table) - 1;

	static const u16 agc_reg_array[IGP02E1000_PHY_CHANNEL_NUM] = {

		IGP02E1000_PHY_AGC_A,

		IGP02E1000_PHY_AGC_B,
@@ -1863,7 +1857,7 @@ s32 igb_get_cable_length_igp_2(struct e1000_hw *hw) 
				IGP02E1000_AGC_LENGTH_MASK;



		/* Array index bound check. */

		if ((cur_agc_index >= IGP02E1000_CABLE_LENGTH_TABLE_SIZE) ||

		if ((cur_agc_index >= ARRAY_SIZE(e1000_igp_2_cable_length_table)) ||

		    (cur_agc_index == 0)) {

			ret_val = -E1000_ERR_PHY;

			goto out;