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

[mirror_ubuntu-disco-kernel.git] / drivers / net / ethernet / sfc / falcon / efx.c

diff --git a/drivers/net/ethernet/sfc/falcon/efx.c b/drivers/net/ethernet/sfc/falcon/efx.c
index 6685a66ee1a3b85624414f65a8c8f24a0994b87d..3d6c91e96589870ca540331350ceae7563e163c5 100644 (file)
--- a/drivers/net/ethernet/sfc/falcon/efx.c
+++ b/drivers/net/ethernet/sfc/falcon/efx.c
@@ -2543,7 +2543,7 @@ static void ef4_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_RECOVER_OR_DISABLE ||
@@ -2603,7 +2603,7 @@ void ef4_schedule_reset(struct ef4_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;
 
        queue_work(reset_workqueue, &efx->reset_work);