ixgbe: Use a signed type to hold error codes
Subsystems (2)
PATCH 1/1 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.
---
0 files changed
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +5 -5
@@ -3053,7 +3053,7 @@ static int ixgbe_get_module_info(struct net_device *dev, {struct ixgbe_adapter *adapter =netdev_priv (dev);struct ixgbe_hw *hw = &adapter->hw; -u32 status; +s32 status;u8 sff8472_rev, addr_mode;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,IXGBE_SFF_SFF_8472_COMP , &sff8472_rev); -if (status !=0 ) +if (status)return -EIO ;/* addressing mode is not supported */ status = hw->phy.ops.read_i2c_eeprom (hw,IXGBE_SFF_SFF_8472_SWAP , &addr_mode); -if (status !=0 ) +if (status)return -EIO ;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_hw *hw = &adapter->hw; -u32 status =IXGBE_ERR_PHY_ADDR_INVALID ; +s32 status =IXGBE_ERR_PHY_ADDR_INVALID ;u8 databyte =0xFF ;int i =0 ;
@@ -3112,7 +3112,7 @@ static int ixgbe_get_module_eeprom(struct net_device *dev,else status = hw->phy.ops.read_i2c_sff8472 (hw, i, &databyte); -if (status !=0 ) +if (status)return -EIO ; data[i - ee->offset] = databyte;
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +2 -2
@@ -4757,7 +4757,7 @@ static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw) {u32 speed;bool autoneg, link_up = false; -u32 ret =IXGBE_ERR_LINK_SETUP ; +int ret =IXGBE_ERR_LINK_SETUP ;if (hw->mac.ops.check_link) 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 ;nla_for_each_nested (attr, br_spec, rem) { -u32 status; +int status;__u16 mode;if (nla_type (attr) !=IFLA_BRIDGE_MODE )
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +2 -2
@@ -317,14 +317,14 @@ bool ixgbe_check_reset_blocked(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_low =0 ; status = hw->phy.ops.read_reg (hw,MDIO_DEVID1 ,MDIO_MMD_PMAPMD , &phy_id_high); -if (status ==0 ) { +if (!status) { hw->phy.id = (u32)(phy_id_high <<16 ); status = hw->phy.ops.read_reg (hw,MDIO_DEVID2 ,MDIO_MMD_PMAPMD , &phy_id_low);
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +2 -2
@@ -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) { -u32 status; +s32 status;u16 lasi, autoneg_status, 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) { -u32 status; +s32 status;u16 reg;u32 retries =2 ;
PATCH 1/1 ixgbe: Use a signed type to hold error codes
Quoted 5 lines · Mark D Rustad
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 Mark Rustad <[email protected]>
Thanks Mark, I have applied your patch to my queue.
Signature · 9 lines
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git dev-queue -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: This is a digitally signed message part URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20150410/d3de88ce/attachment.asc>
Schmitt
PATCH 1/1 ixgbe: Use a signed type to hold error codes
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Jeff Kirsher
Sent: Friday, April 10, 2015 3:56 PM
To: Rustad, Mark D
Cc: intel-wired-lan at lists.osuosl.org
Subject: Re: [Intel-wired-lan] [PATCH] ixgbe: Use a signed type to hold error codesQuoted 4 lines · Mark D Rustad
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.
Quoted 6 lines
Quoted 1 line
Signed-off-by Mark Rustad <[email protected]>Thanks Mark, I have applied your patch to my queue. --
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
dev-queue