arch: Mass conversion of smp_mb__*()

[deliverable/linux.git] / drivers / net / ethernet / broadcom / bnx2x / bnx2x_sp.c

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
index 31297266b743e27fa527da4636bc893b1c64cc56..d725317c42773822ee5f945960df8a66e0f3df66 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
@@ -258,16 +258,16 @@ static bool bnx2x_raw_check_pending(struct bnx2x_raw_obj *o)
 
 static void bnx2x_raw_clear_pending(struct bnx2x_raw_obj *o)
 {
-       smp_mb__before_clear_bit();
+       smp_mb__before_atomic();
        clear_bit(o->state, o->pstate);
-       smp_mb__after_clear_bit();
+       smp_mb__after_atomic();
 }
 
 static void bnx2x_raw_set_pending(struct bnx2x_raw_obj *o)
 {
-       smp_mb__before_clear_bit();
+       smp_mb__before_atomic();
        set_bit(o->state, o->pstate);
-       smp_mb__after_clear_bit();
+       smp_mb__after_atomic();
 }
 
 /**
@@ -2131,7 +2131,7 @@ static int bnx2x_set_rx_mode_e1x(struct bnx2x *bp,
 
        /* The operation is completed */
        clear_bit(p->state, p->pstate);
-       smp_mb__after_clear_bit();
+       smp_mb__after_atomic();
 
        return 0;
 }
@@ -3576,16 +3576,16 @@ error_exit1:
 
 static void bnx2x_mcast_clear_sched(struct bnx2x_mcast_obj *o)
 {
-       smp_mb__before_clear_bit();
+       smp_mb__before_atomic();
        clear_bit(o->sched_state, o->raw.pstate);
-       smp_mb__after_clear_bit();
+       smp_mb__after_atomic();
 }
 
 static void bnx2x_mcast_set_sched(struct bnx2x_mcast_obj *o)
 {
-       smp_mb__before_clear_bit();
+       smp_mb__before_atomic();
        set_bit(o->sched_state, o->raw.pstate);
-       smp_mb__after_clear_bit();
+       smp_mb__after_atomic();
 }
 
 static bool bnx2x_mcast_check_sched(struct bnx2x_mcast_obj *o)
@@ -4200,7 +4200,7 @@ int bnx2x_queue_state_change(struct bnx2x *bp,
                if (rc) {
                        o->next_state = BNX2X_Q_STATE_MAX;
                        clear_bit(pending_bit, pending);
-                       smp_mb__after_clear_bit();
+                       smp_mb__after_atomic();
                        return rc;
                }
 
@@ -4288,7 +4288,7 @@ static int bnx2x_queue_comp_cmd(struct bnx2x *bp,
        wmb();
 
        clear_bit(cmd, &o->pending);
-       smp_mb__after_clear_bit();
+       smp_mb__after_atomic();
 
        return 0;
 }
@@ -5279,7 +5279,7 @@ static inline int bnx2x_func_state_change_comp(struct bnx2x *bp,
        wmb();
 
        clear_bit(cmd, &o->pending);
-       smp_mb__after_clear_bit();
+       smp_mb__after_atomic();
 
        return 0;
 }
@@ -5926,7 +5926,7 @@ int bnx2x_func_state_change(struct bnx2x *bp,
                if (rc) {
                        o->next_state = BNX2X_F_STATE_MAX;
                        clear_bit(cmd, pending);
-                       smp_mb__after_clear_bit();
+                       smp_mb__after_atomic();
                        return rc;
                }