bnx2x: Semantic renovation

Mostly corrects white spaces, indentations, and comments.

Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 21 insertions, 29 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 3e08a24890e5..9e8c37d007a4 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -141,8 +141,8 @@ do {						\
 #define bnx2x_mc_addr(ha)      ((ha)->addr)
 #define bnx2x_uc_addr(ha)      ((ha)->addr)
 
-#define U64_LO(x)                       (u32)(((u64)(x)) & 0xffffffff)
-#define U64_HI(x)                       (u32)(((u64)(x)) >> 32)
+#define U64_LO(x)                       ((u32)(((u64)(x)) & 0xffffffff))
+#define U64_HI(x)                       ((u32)(((u64)(x)) >> 32))
 #define HILO_U64(hi, lo)                ((((u64)(hi)) << 32) + (lo))
 
 
@@ -812,7 +812,7 @@ struct bnx2x_common {
 #define CHIP_NUM_57811                  0x163d
 #define CHIP_NUM_57811_MF               0x163e
 #define CHIP_NUM_57811_VF               0x163f
-#define CHIP_NUM_57840_OBSOLETE 0x168d
+#define CHIP_NUM_57840_OBSOLETE         0x168d
 #define CHIP_NUM_57840_MF_OBSOLETE      0x16ab
 #define CHIP_NUM_57840_4_10             0x16a1
 #define CHIP_NUM_57840_2_20             0x16a2
@@ -1195,11 +1195,11 @@ struct bnx2x_fw_stats_req {
 };
 
 struct bnx2x_fw_stats_data {
-        struct stats_counter    storm_counters;
-        struct per_port_stats   port;
-        struct per_pf_stats     pf;
+        struct stats_counter            storm_counters;
+        struct per_port_stats           port;
+        struct per_pf_stats             pf;
         struct fcoe_statistics_params   fcoe;
-        struct per_queue_stats  queue_stats[1];
+        struct per_queue_stats          queue_stats[1];
 };
 
 /* Public slow path states */
@@ -1343,8 +1343,6 @@ struct bnx2x {
         __le16                  *eq_cons_sb;
         atomic_t                eq_spq_left; /* COMMON_XXX ramrods credit */
 
-
-
         /* Counter for marking that there is a STAT_QUERY ramrod pending */
         u16                     stats_pending;
         /*  Counter for completed statistics ramrods */
@@ -2076,10 +2074,8 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id,
 #define BNX2X_LOOPBACK_FAILED           (BNX2X_MAC_LOOPBACK_FAILED | \
                                          BNX2X_PHY_LOOPBACK_FAILED)
 
-
 #define STROM_ASSERT_ARRAY_SIZE         50
 
-
 /* must be used on a CID before placing it on a HW ring */
 #define HW_CID(bp, x)                   ((BP_PORT(bp) << 23) | \
                                          (BP_VN(bp) << BNX2X_SWCID_SHIFT) | \
@@ -2110,7 +2106,6 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id,
 /* Memory of fairness algorithm . 2 cycles */
 #define FAIR_MEM                                        2
 
-
 #define ATTN_NIG_FOR_FUNC               (1L << 8)
 #define ATTN_SW_TIMER_4_FUNC            (1L << 9)
 #define GPIO_2_FUNC                     (1L << 10)
@@ -2215,7 +2210,6 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id,
 
 #define MULTI_MASK                      0x7f
 
-
 #define DEF_USB_FUNC_OFF        offsetof(struct cstorm_def_status_block_u, func)
 #define DEF_CSB_FUNC_OFF        offsetof(struct cstorm_def_status_block_c, func)
 #define DEF_XSB_FUNC_OFF        offsetof(struct xstorm_def_status_block, func)
@@ -2243,18 +2237,6 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id,
                 (&bp->def_status_blk->sp_sb.\
                                         index_values[HC_SP_INDEX_ETH_DEF_CONS])
 
-#define SET_FLAG(value, mask, flag) \
-        do {\
-                (value) &= ~(mask);\
-                (value) |= ((flag) << (mask##_SHIFT));\
-        } while (0)
-
-#define GET_FLAG(value, mask) \
-        (((value) & (mask)) >> (mask##_SHIFT))
-
-#define GET_FIELD(value, fname) \
-        (((value) & (fname##_MASK)) >> (fname##_SHIFT))
-
 #define CAM_IS_INVALID(x) \
         (GET_FLAG(x.flags, \
         MAC_CONFIGURATION_ENTRY_ACTION_TYPE) == \
@@ -2265,7 +2247,6 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id,
 #define MC_HASH_OFFSET(bp, i)           (BAR_TSTRORM_INTMEM + \
         TSTORM_APPROXIMATE_MATCH_MULTICAST_FILTERING_OFFSET(BP_FUNC(bp)) + i*4)
 
-
 #ifndef PXP2_REG_PXP2_INT_STS
 #define PXP2_REG_PXP2_INT_STS           PXP2_REG_PXP2_INT_STS_0
 #endif
@@ -2285,8 +2266,8 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id,
                             (!((me_reg) & ME_REG_VF_ERR)))
 int bnx2x_nic_load_analyze_req(struct bnx2x *bp, u32 load_code);
 /* Congestion management fairness mode */
-#define CMNG_FNS_NONE           0
-#define CMNG_FNS_MINMAX         1
+#define CMNG_FNS_NONE                   0
+#define CMNG_FNS_MINMAX                 1
 
 #define HC_SEG_ACCESS_DEF               0   /*Driver decision 0-3*/
 #define HC_SEG_ACCESS_ATTN              4
@@ -2302,7 +2283,6 @@ static const u32 dmae_reg_go_c[] = {
 void bnx2x_set_ethtool_ops(struct net_device *netdev);
 void bnx2x_notify_link_changed(struct bnx2x *bp);
 
-
 #define BNX2X_MF_SD_PROTOCOL(bp) \
         ((bp)->mf_config[BP_VN(bp)] & FUNC_MF_CFG_PROTOCOL_MASK)
 
@@ -2323,6 +2303,18 @@ void bnx2x_notify_link_changed(struct bnx2x *bp);
                                 (BNX2X_IS_MF_SD_PROTOCOL_ISCSI(bp) || \
                                  BNX2X_IS_MF_SD_PROTOCOL_FCOE(bp)))
 
+#define SET_FLAG(value, mask, flag) \
+        do {\
+                (value) &= ~(mask);\
+                (value) |= ((flag) << (mask##_SHIFT));\
+        } while (0)
+
+#define GET_FLAG(value, mask) \
+        (((value) & (mask)) >> (mask##_SHIFT))
+
+#define GET_FIELD(value, fname) \
+        (((value) & (fname##_MASK)) >> (fname##_SHIFT))
+
 enum {
         SWITCH_UPDATE,
         AFEX_UPDATE,