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

Commit 51d0420b authored by Emil Tantilov's avatar Emil Tantilov Committed by Jeff Kirsher
Browse files

ixgbe: cleanup error checking in ixgbe_identify_sfp_module_generic() 



This patch replaces instances where a return code from i2c operations
were checked against a list of error codes with a much simpler
if ( status != 0 ) check.

Some whitespace cleanups included.

Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent d0310dc4

drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

+10 −24
Original line number Diff line number Diff line
@@ -854,9 +854,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) 
					     IXGBE_SFF_IDENTIFIER,

					     &identifier);



	if (status == IXGBE_ERR_SWFW_SYNC ||

	    status == IXGBE_ERR_I2C ||

	    status == IXGBE_ERR_SFP_NOT_PRESENT)

	if (status != 0)

		goto err_read_i2c_eeprom;



	/* LAN ID is needed for sfp_type determination */
@@ -870,26 +868,20 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) 
						     IXGBE_SFF_1GBE_COMP_CODES,

						     &comp_codes_1g);



		if (status == IXGBE_ERR_SWFW_SYNC ||

		    status == IXGBE_ERR_I2C ||

		    status == IXGBE_ERR_SFP_NOT_PRESENT)

		if (status != 0)

			goto err_read_i2c_eeprom;



		status = hw->phy.ops.read_i2c_eeprom(hw,

						     IXGBE_SFF_10GBE_COMP_CODES,

						     &comp_codes_10g);



		if (status == IXGBE_ERR_SWFW_SYNC ||

		    status == IXGBE_ERR_I2C ||

		    status == IXGBE_ERR_SFP_NOT_PRESENT)

		if (status != 0)

			goto err_read_i2c_eeprom;

		status = hw->phy.ops.read_i2c_eeprom(hw,

						     IXGBE_SFF_CABLE_TECHNOLOGY,

						     &cable_tech);



		if (status == IXGBE_ERR_SWFW_SYNC ||

		    status == IXGBE_ERR_I2C ||

		    status == IXGBE_ERR_SFP_NOT_PRESENT)

		if (status != 0)

			goto err_read_i2c_eeprom;



		 /* ID Module
@@ -987,27 +979,21 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) 
						    IXGBE_SFF_VENDOR_OUI_BYTE0,

						    &oui_bytes[0]);



			if (status == IXGBE_ERR_SWFW_SYNC ||

			    status == IXGBE_ERR_I2C ||

			    status == IXGBE_ERR_SFP_NOT_PRESENT)

			if (status != 0)

				goto err_read_i2c_eeprom;



			status = hw->phy.ops.read_i2c_eeprom(hw,

			                            IXGBE_SFF_VENDOR_OUI_BYTE1,

			                            &oui_bytes[1]);



			if (status == IXGBE_ERR_SWFW_SYNC ||

			    status == IXGBE_ERR_I2C ||

			    status == IXGBE_ERR_SFP_NOT_PRESENT)

			if (status != 0)

				goto err_read_i2c_eeprom;



			status = hw->phy.ops.read_i2c_eeprom(hw,

			                            IXGBE_SFF_VENDOR_OUI_BYTE2,

			                            &oui_bytes[2]);



			if (status == IXGBE_ERR_SWFW_SYNC ||

			    status == IXGBE_ERR_I2C ||

			    status == IXGBE_ERR_SFP_NOT_PRESENT)

			if (status != 0)

				goto err_read_i2c_eeprom;



			vendor_oui =