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

Commit a1e869de authored by Mark Rustad's avatar Mark Rustad Committed by Jeff Kirsher
Browse files

ixgbe: Use a signed type to hold error codes 



Because error codes are negative, it only makes sense to
consistently use signed types when handling them. Also remove
some explicit comparisons with 0 on these variables.

Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent cb2effe5

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -3053,7 +3053,7 @@ static int ixgbe_get_module_info(struct net_device *dev, 
{

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_hw *hw = &adapter->hw;

	struct ixgbe_hw *hw = &adapter->hw;

	u32 status;

	s32 status;

	u8 sff8472_rev, addr_mode;

	u8 sff8472_rev, addr_mode;

	bool page_swap = false;

	bool page_swap = false;
@@ -3061,14 +3061,14 @@ static int ixgbe_get_module_info(struct net_device *dev, 
	status = hw->phy.ops.read_i2c_eeprom(hw,

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

					     IXGBE_SFF_SFF_8472_COMP,

					     IXGBE_SFF_SFF_8472_COMP,

					     &sff8472_rev);

					     &sff8472_rev);

	if (status != 0)

	if (status)

		return -EIO;

		return -EIO;





	/* addressing mode is not supported */

	/* addressing mode is not supported */

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

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

					     IXGBE_SFF_SFF_8472_SWAP,

					     IXGBE_SFF_SFF_8472_SWAP,

					     &addr_mode);

					     &addr_mode);

	if (status != 0)

	if (status)

		return -EIO;

		return -EIO;





	if (addr_mode & IXGBE_SFF_ADDRESSING_MODE) {

	if (addr_mode & IXGBE_SFF_ADDRESSING_MODE) {
@@ -3095,7 +3095,7 @@ static int ixgbe_get_module_eeprom(struct net_device *dev, 
{

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_hw *hw = &adapter->hw;

	struct ixgbe_hw *hw = &adapter->hw;

	u32 status = IXGBE_ERR_PHY_ADDR_INVALID;

	s32 status = IXGBE_ERR_PHY_ADDR_INVALID;

	u8 databyte = 0xFF;

	u8 databyte = 0xFF;

	int i = 0;

	int i = 0;
@@ -3112,7 +3112,7 @@ static int ixgbe_get_module_eeprom(struct net_device *dev, 
		else

		else

			status = hw->phy.ops.read_i2c_sff8472(hw, i, &databyte);

			status = hw->phy.ops.read_i2c_sff8472(hw, i, &databyte);





		if (status != 0)

		if (status)

			return -EIO;

			return -EIO;





		data[i - ee->offset] = databyte;

		data[i - ee->offset] = databyte;

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -4757,7 +4757,7 @@ static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw) 
{

{

	u32 speed;

	u32 speed;

	bool autoneg, link_up = false;

	bool autoneg, link_up = false;

	u32 ret = IXGBE_ERR_LINK_SETUP;

	int ret = IXGBE_ERR_LINK_SETUP;





	if (hw->mac.ops.check_link)

	if (hw->mac.ops.check_link)

		ret = hw->mac.ops.check_link(hw, &speed, &link_up, false);

		ret = hw->mac.ops.check_link(hw, &speed, &link_up, false);
@@ -8022,7 +8022,7 @@ static int ixgbe_ndo_bridge_setlink(struct net_device *dev, 
		return -EINVAL;

		return -EINVAL;





	nla_for_each_nested(attr, br_spec, rem) {

	nla_for_each_nested(attr, br_spec, rem) {

		u32 status;

		int status;

		__u16 mode;

		__u16 mode;





		if (nla_type(attr) != IFLA_BRIDGE_MODE)

		if (nla_type(attr) != IFLA_BRIDGE_MODE)

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -317,14 +317,14 @@ bool ixgbe_check_reset_blocked(struct ixgbe_hw *hw) 
 **/

 **/

static s32 ixgbe_get_phy_id(struct ixgbe_hw *hw)

static s32 ixgbe_get_phy_id(struct ixgbe_hw *hw)

{

{

	u32 status;

	s32 status;

	u16 phy_id_high = 0;

	u16 phy_id_high = 0;

	u16 phy_id_low = 0;

	u16 phy_id_low = 0;





	status = hw->phy.ops.read_reg(hw, MDIO_DEVID1, MDIO_MMD_PMAPMD,

	status = hw->phy.ops.read_reg(hw, MDIO_DEVID1, MDIO_MMD_PMAPMD,

				      &phy_id_high);

				      &phy_id_high);





	if (status == 0) {

	if (!status) {

		hw->phy.id = (u32)(phy_id_high << 16);

		hw->phy.id = (u32)(phy_id_high << 16);

		status = hw->phy.ops.read_reg(hw, MDIO_DEVID2, MDIO_MMD_PMAPMD,

		status = hw->phy.ops.read_reg(hw, MDIO_DEVID2, MDIO_MMD_PMAPMD,

					      &phy_id_low);

					      &phy_id_low);

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -1063,7 +1063,7 @@ static s32 ixgbe_setup_kr_x550em(struct ixgbe_hw *hw) 
 **/

 **/

static s32 ixgbe_setup_internal_phy_x550em(struct ixgbe_hw *hw)

static s32 ixgbe_setup_internal_phy_x550em(struct ixgbe_hw *hw)

{

{

	u32 status;

	s32 status;

	u16 lasi, autoneg_status, speed;

	u16 lasi, autoneg_status, speed;

	ixgbe_link_speed force_speed;

	ixgbe_link_speed force_speed;
@@ -1205,7 +1205,7 @@ static enum ixgbe_media_type ixgbe_get_media_type_X550em(struct ixgbe_hw *hw) 
 **/

 **/

static s32 ixgbe_init_ext_t_x550em(struct ixgbe_hw *hw)

static s32 ixgbe_init_ext_t_x550em(struct ixgbe_hw *hw)

{

{

	u32 status;

	s32 status;

	u16 reg;

	u16 reg;

	u32 retries = 2;

	u32 retries = 2;