ixgbe: Make return values more direct

Make return values more direct, eliminating some gotos and
otherwise unneeded conditionals. This also eliminates some
local variables. Also a few minor cleanups in affected code
so checkpatch won't complain.

Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 45 insertions, 61 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
index 50479575e131..cc8f0128286c 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
@@ -43,16 +43,15 @@
 s32 ixgbe_read_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
 {
         struct ixgbe_mbx_info *mbx = &hw->mbx;
-        s32 ret_val = IXGBE_ERR_MBX;
 
         /* limit read to size of mailbox */
         if (size > mbx->size)
                 size = mbx->size;
 
-        if (mbx->ops.read)
-                ret_val = mbx->ops.read(hw, msg, size, mbx_id);
+        if (!mbx->ops.read)
+                return IXGBE_ERR_MBX;
 
-        return ret_val;
+        return mbx->ops.read(hw, msg, size, mbx_id);
 }
 
 /**
@@ -87,12 +86,11 @@ s32 ixgbe_write_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
 s32 ixgbe_check_for_msg(struct ixgbe_hw *hw, u16 mbx_id)
 {
         struct ixgbe_mbx_info *mbx = &hw->mbx;
-        s32 ret_val = IXGBE_ERR_MBX;
 
-        if (mbx->ops.check_for_msg)
-                ret_val = mbx->ops.check_for_msg(hw, mbx_id);
+        if (!mbx->ops.check_for_msg)
+                return IXGBE_ERR_MBX;
 
-        return ret_val;
+        return mbx->ops.check_for_msg(hw, mbx_id);
 }
 
 /**
@@ -105,12 +103,11 @@ s32 ixgbe_check_for_msg(struct ixgbe_hw *hw, u16 mbx_id)
 s32 ixgbe_check_for_ack(struct ixgbe_hw *hw, u16 mbx_id)
 {
         struct ixgbe_mbx_info *mbx = &hw->mbx;
-        s32 ret_val = IXGBE_ERR_MBX;
 
-        if (mbx->ops.check_for_ack)
-                ret_val = mbx->ops.check_for_ack(hw, mbx_id);
+        if (!mbx->ops.check_for_ack)
+                return IXGBE_ERR_MBX;
 
-        return ret_val;
+        return mbx->ops.check_for_ack(hw, mbx_id);
 }
 
 /**
@@ -123,12 +120,11 @@ s32 ixgbe_check_for_ack(struct ixgbe_hw *hw, u16 mbx_id)
 s32 ixgbe_check_for_rst(struct ixgbe_hw *hw, u16 mbx_id)
 {
         struct ixgbe_mbx_info *mbx = &hw->mbx;
-        s32 ret_val = IXGBE_ERR_MBX;
 
-        if (mbx->ops.check_for_rst)
-                ret_val = mbx->ops.check_for_rst(hw, mbx_id);
+        if (!mbx->ops.check_for_rst)
+                return IXGBE_ERR_MBX;
 
-        return ret_val;
+        return mbx->ops.check_for_rst(hw, mbx_id);
 }
 
 /**
@@ -144,17 +140,16 @@ static s32 ixgbe_poll_for_msg(struct ixgbe_hw *hw, u16 mbx_id)
         int countdown = mbx->timeout;
 
         if (!countdown || !mbx->ops.check_for_msg)
-                goto out;
+                return IXGBE_ERR_MBX;
 
-        while (countdown && mbx->ops.check_for_msg(hw, mbx_id)) {
+        while (mbx->ops.check_for_msg(hw, mbx_id)) {
                 countdown--;
                 if (!countdown)
-                        break;
+                        return IXGBE_ERR_MBX;
                 udelay(mbx->usec_delay);
         }
 
-out:
-        return countdown ? 0 : IXGBE_ERR_MBX;
+        return 0;
 }
 
 /**
@@ -170,17 +165,16 @@ static s32 ixgbe_poll_for_ack(struct ixgbe_hw *hw, u16 mbx_id)
         int countdown = mbx->timeout;
 
         if (!countdown || !mbx->ops.check_for_ack)
-                goto out;
+                return IXGBE_ERR_MBX;
 
-        while (countdown && mbx->ops.check_for_ack(hw, mbx_id)) {
+        while (mbx->ops.check_for_ack(hw, mbx_id)) {
                 countdown--;
                 if (!countdown)
-                        break;
+                        return IXGBE_ERR_MBX;
                 udelay(mbx->usec_delay);
         }
 
-out:
-        return countdown ? 0 : IXGBE_ERR_MBX;
+        return 0;
 }
 
 /**
@@ -197,18 +191,17 @@ static s32 ixgbe_read_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size,
                                  u16 mbx_id)
 {
         struct ixgbe_mbx_info *mbx = &hw->mbx;
-        s32 ret_val = IXGBE_ERR_MBX;
+        s32 ret_val;
 
         if (!mbx->ops.read)
-                goto out;
+                return IXGBE_ERR_MBX;
 
         ret_val = ixgbe_poll_for_msg(hw, mbx_id);
+        if (ret_val)
+                return ret_val;
 
-        /* if ack received read message, otherwise we timed out */
-        if (!ret_val)
-                ret_val = mbx->ops.read(hw, msg, size, mbx_id);
-out:
-        return ret_val;
+        /* if ack received read message */
+        return mbx->ops.read(hw, msg, size, mbx_id);
 }
 
 /**
@@ -225,33 +218,31 @@ static s32 ixgbe_write_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size,
                            u16 mbx_id)
 {
         struct ixgbe_mbx_info *mbx = &hw->mbx;
-        s32 ret_val = IXGBE_ERR_MBX;
+        s32 ret_val;
 
         /* exit if either we can't write or there isn't a defined timeout */
         if (!mbx->ops.write || !mbx->timeout)
-                goto out;
+                return IXGBE_ERR_MBX;
 
         /* send msg */
         ret_val = mbx->ops.write(hw, msg, size, mbx_id);
+        if (ret_val)
+                return ret_val;
 
         /* if msg sent wait until we receive an ack */
-        if (!ret_val)
-                ret_val = ixgbe_poll_for_ack(hw, mbx_id);
-out:
-        return ret_val;
+        return ixgbe_poll_for_ack(hw, mbx_id);
 }
 
 static s32 ixgbe_check_for_bit_pf(struct ixgbe_hw *hw, u32 mask, s32 index)
 {
         u32 mbvficr = IXGBE_READ_REG(hw, IXGBE_MBVFICR(index));
-        s32 ret_val = IXGBE_ERR_MBX;
 
         if (mbvficr & mask) {
-                ret_val = 0;
                 IXGBE_WRITE_REG(hw, IXGBE_MBVFICR(index), mask);
+                return 0;
         }
 
-        return ret_val;
+        return IXGBE_ERR_MBX;
 }
 
 /**
@@ -263,17 +254,16 @@ static s32 ixgbe_check_for_bit_pf(struct ixgbe_hw *hw, u32 mask, s32 index)
  **/
 static s32 ixgbe_check_for_msg_pf(struct ixgbe_hw *hw, u16 vf_number)
 {
-        s32 ret_val = IXGBE_ERR_MBX;
         s32 index = IXGBE_MBVFICR_INDEX(vf_number);
         u32 vf_bit = vf_number % 16;
 
         if (!ixgbe_check_for_bit_pf(hw, IXGBE_MBVFICR_VFREQ_VF1 << vf_bit,
                                     index)) {
-                ret_val = 0;
                 hw->mbx.stats.reqs++;
+                return 0;
         }
 
-        return ret_val;
+        return IXGBE_ERR_MBX;
 }
 
 /**
@@ -285,17 +275,16 @@ static s32 ixgbe_check_for_msg_pf(struct ixgbe_hw *hw, u16 vf_number)
  **/
 static s32 ixgbe_check_for_ack_pf(struct ixgbe_hw *hw, u16 vf_number)
 {
-        s32 ret_val = IXGBE_ERR_MBX;
         s32 index = IXGBE_MBVFICR_INDEX(vf_number);
         u32 vf_bit = vf_number % 16;
 
         if (!ixgbe_check_for_bit_pf(hw, IXGBE_MBVFICR_VFACK_VF1 << vf_bit,
                                     index)) {
-                ret_val = 0;
                 hw->mbx.stats.acks++;
+                return 0;
         }
 
-        return ret_val;
+        return IXGBE_ERR_MBX;
 }
 
 /**
@@ -310,7 +299,6 @@ static s32 ixgbe_check_for_rst_pf(struct ixgbe_hw *hw, u16 vf_number)
         u32 reg_offset = (vf_number < 32) ? 0 : 1;
         u32 vf_shift = vf_number % 32;
         u32 vflre = 0;
-        s32 ret_val = IXGBE_ERR_MBX;
 
         switch (hw->mac.type) {
         case ixgbe_mac_82599EB:
@@ -324,12 +312,12 @@ static s32 ixgbe_check_for_rst_pf(struct ixgbe_hw *hw, u16 vf_number)
         }
 
         if (vflre & (1 << vf_shift)) {
-                ret_val = 0;
                 IXGBE_WRITE_REG(hw, IXGBE_VFLREC(reg_offset), (1 << vf_shift));
                 hw->mbx.stats.rsts++;
+                return 0;
         }
 
-        return ret_val;
+        return IXGBE_ERR_MBX;
 }
 
 /**
@@ -341,7 +329,6 @@ static s32 ixgbe_check_for_rst_pf(struct ixgbe_hw *hw, u16 vf_number)
  **/
 static s32 ixgbe_obtain_mbx_lock_pf(struct ixgbe_hw *hw, u16 vf_number)
 {
-        s32 ret_val = IXGBE_ERR_MBX;
         u32 p2v_mailbox;
 
         /* Take ownership of the buffer */
@@ -350,9 +337,9 @@ static s32 ixgbe_obtain_mbx_lock_pf(struct ixgbe_hw *hw, u16 vf_number)
         /* reserve mailbox for vf use */
         p2v_mailbox = IXGBE_READ_REG(hw, IXGBE_PFMAILBOX(vf_number));
         if (p2v_mailbox & IXGBE_PFMAILBOX_PFU)
-                ret_val = 0;
+                return 0;
 
-        return ret_val;
+        return IXGBE_ERR_MBX;
 }
 
 /**
@@ -373,7 +360,7 @@ static s32 ixgbe_write_mbx_pf(struct ixgbe_hw *hw, u32 *msg, u16 size,
         /* lock the mailbox to prevent pf/vf race condition */
         ret_val = ixgbe_obtain_mbx_lock_pf(hw, vf_number);
         if (ret_val)
-                goto out_no_write;
+                return ret_val;
 
         /* flush msg and acks as we are overwriting the message buffer */
         ixgbe_check_for_msg_pf(hw, vf_number);
@@ -389,9 +376,7 @@ static s32 ixgbe_write_mbx_pf(struct ixgbe_hw *hw, u32 *msg, u16 size,
         /* update stats */
         hw->mbx.stats.msgs_tx++;
 
-out_no_write:
-        return ret_val;
-
+        return 0;
 }
 
 /**
@@ -414,7 +399,7 @@ static s32 ixgbe_read_mbx_pf(struct ixgbe_hw *hw, u32 *msg, u16 size,
         /* lock the mailbox to prevent pf/vf race condition */
         ret_val = ixgbe_obtain_mbx_lock_pf(hw, vf_number);
         if (ret_val)
-                goto out_no_read;
+                return ret_val;
 
         /* copy the message to the mailbox memory buffer */
         for (i = 0; i < size; i++)
@@ -426,8 +411,7 @@ static s32 ixgbe_read_mbx_pf(struct ixgbe_hw *hw, u32 *msg, u16 size,
         /* update stats */
         hw->mbx.stats.msgs_rx++;
 
-out_no_read:
-        return ret_val;
+        return 0;
 }
 
 #ifdef CONFIG_PCI_IOV