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

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

diff --git a/drivers/net/ethernet/sfc/farch.c b/drivers/net/ethernet/sfc/farch.c
index 6608dfe455b17beb87eb79bfbb6438b18b22a71b..5334dc83d926024e854420f8075d1b9e0a5af04c 100644 (file)
--- a/drivers/net/ethernet/sfc/farch.c
+++ b/drivers/net/ethernet/sfc/farch.c
@@ -827,7 +827,7 @@ efx_farch_handle_tx_event(struct efx_channel *channel, efx_qword_t *event)
        struct efx_nic *efx = channel->efx;
        int tx_packets = 0;
 
-       if (unlikely(ACCESS_ONCE(efx->reset_pending)))
+       if (unlikely(READ_ONCE(efx->reset_pending)))
                return 0;
 
        if (likely(EFX_QWORD_FIELD(*event, FSF_AZ_TX_EV_COMP))) {
@@ -983,7 +983,7 @@ efx_farch_handle_rx_event(struct efx_channel *channel, const efx_qword_t *event)
        struct efx_rx_queue *rx_queue;
        struct efx_nic *efx = channel->efx;
 
-       if (unlikely(ACCESS_ONCE(efx->reset_pending)))
+       if (unlikely(READ_ONCE(efx->reset_pending)))
                return;
 
        rx_ev_cont = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_JUMBO_CONT);
@@ -1524,7 +1524,7 @@ irqreturn_t efx_farch_fatal_interrupt(struct efx_nic *efx)
 irqreturn_t efx_farch_legacy_interrupt(int irq, void *dev_id)
 {
        struct efx_nic *efx = dev_id;
-       bool soft_enabled = ACCESS_ONCE(efx->irq_soft_enabled);
+       bool soft_enabled = READ_ONCE(efx->irq_soft_enabled);
        efx_oword_t *int_ker = efx->irq_status.addr;
        irqreturn_t result = IRQ_NONE;
        struct efx_channel *channel;
@@ -1616,7 +1616,7 @@ irqreturn_t efx_farch_msi_interrupt(int irq, void *dev_id)
                   "IRQ %d on CPU %d status " EFX_OWORD_FMT "\n",
                   irq, raw_smp_processor_id(), EFX_OWORD_VAL(*int_ker));
 
-       if (!likely(ACCESS_ONCE(efx->irq_soft_enabled)))
+       if (!likely(READ_ONCE(efx->irq_soft_enabled)))
                return IRQ_HANDLED;
 
        /* Handle non-event-queue sources */