44 files changed, 153 insertions, 153 deletions

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index ae098a261fcd..eee55c1e5fde 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -105,7 +105,7 @@ static bool genpd_sd_counter_dec(struct generic_pm_domain *genpd)
 static void genpd_sd_counter_inc(struct generic_pm_domain *genpd)
 {
         atomic_inc(&genpd->sd_count);
-        smp_mb__after_atomic_inc();
+        smp_mb__after_atomic();
 }
 
 static void genpd_acquire_lock(struct generic_pm_domain *genpd)
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 59c5abe32f06..4fd8d6c1c3d2 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -224,9 +224,9 @@ static int get_slot(struct mtip_port *port)
  */
 static inline void release_slot(struct mtip_port *port, int tag)
 {
-        smp_mb__before_clear_bit();
+        smp_mb__before_atomic();
         clear_bit(tag, port->allocated);
-        smp_mb__after_clear_bit();
+        smp_mb__after_atomic();
 }
 
 /*
diff --git a/drivers/cpuidle/coupled.c b/drivers/cpuidle/coupled.c
index cb6654bfad77..73fe2f8d7f96 100644
--- a/drivers/cpuidle/coupled.c
+++ b/drivers/cpuidle/coupled.c
@@ -159,7 +159,7 @@ void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, atomic_t *a)
 {
         int n = dev->coupled->online_count;
 
-        smp_mb__before_atomic_inc();
+        smp_mb__before_atomic();
         atomic_inc(a);
 
         while (atomic_read(a) < n)
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 8db663219560..995dd42a2627 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -3498,7 +3498,7 @@ static int ohci_flush_iso_completions(struct fw_iso_context *base)
                 }
 
                 clear_bit_unlock(0, &ctx->flushing_completions);
-                smp_mb__after_clear_bit();
+                smp_mb__after_atomic();
         }
 
         tasklet_enable(&ctx->context.tasklet);
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index c2676b5908d9..ec5c3f4cdd01 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -156,7 +156,7 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc)
          */
         if ((vblrc > 0) && (abs64(diff_ns) > 1000000)) {
                 atomic_inc(&dev->vblank[crtc].count);
-                smp_mb__after_atomic_inc();
+                smp_mb__after_atomic();
         }
 
         /* Invalidate all timestamps while vblank irq's are off. */
@@ -864,9 +864,9 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc)
                 vblanktimestamp(dev, crtc, tslot) = t_vblank;
         }
 
-        smp_mb__before_atomic_inc();
+        smp_mb__before_atomic();
         atomic_add(diff, &dev->vblank[crtc].count);
-        smp_mb__after_atomic_inc();
+        smp_mb__after_atomic();
 }
 
 /**
@@ -1330,9 +1330,9 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc)
                 /* Increment cooked vblank count. This also atomically commits
                  * the timestamp computed above.
                  */
-                smp_mb__before_atomic_inc();
+                smp_mb__before_atomic();
                 atomic_inc(&dev->vblank[crtc].count);
-                smp_mb__after_atomic_inc();
+                smp_mb__after_atomic();
         } else {
                 DRM_DEBUG("crtc %d: Redundant vblirq ignored. diff_ns = %d\n",
                           crtc, (int) diff_ns);
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index f98ba4e6e70b..0b99de95593b 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2157,7 +2157,7 @@ static void i915_error_work_func(struct work_struct *work)
                          * updates before
                          * the counter increment.
                          */
-                        smp_mb__before_atomic_inc();
+                        smp_mb__before_atomic();
                         atomic_inc(&dev_priv->gpu_error.reset_counter);
 
                         kobject_uevent_env(&dev->primary->kdev->kobj,
diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h
index 82c9c5d35251..d2ebcf323094 100644
--- a/drivers/md/bcache/bcache.h
+++ b/drivers/md/bcache/bcache.h
@@ -828,7 +828,7 @@ static inline bool cached_dev_get(struct cached_dev *dc)
                 return false;
 
         /* Paired with the mb in cached_dev_attach */
-        smp_mb__after_atomic_inc();
+        smp_mb__after_atomic();
         return true;
 }
 
diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
index 7ef7461912be..a08e3eeac3c5 100644
--- a/drivers/md/bcache/closure.h
+++ b/