Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[sfrench/cifs-2.6.git] / drivers / net / ethernet / sfc / efx.c

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 6668e371405c9f8680fa360de03c1cee19a9004c..e3c492fcaff07d9c6b3c5211609c3bd0bde0eac4 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -2810,7 +2810,7 @@ static void efx_reset_work(struct work_struct *data)
        unsigned long pending;
        enum reset_type method;
 
-       pending = ACCESS_ONCE(efx->reset_pending);
+       pending = READ_ONCE(efx->reset_pending);
        method = fls(pending) - 1;
 
        if (method == RESET_TYPE_MC_BIST)
@@ -2875,7 +2875,7 @@ void efx_schedule_reset(struct efx_nic *efx, enum reset_type type)
        /* If we're not READY then just leave the flags set as the cue
         * to abort probing or reschedule the reset later.
         */
-       if (ACCESS_ONCE(efx->state) != STATE_READY)
+       if (READ_ONCE(efx->state) != STATE_READY)
                return;
 
        /* efx_process_channel() will no longer read events once a