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

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

diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index 46d60013564c9a7d4c2038a28e02867a766a2171..e566dbb3343d7cfbd4b244fbb534c09deb3a74f4 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -2077,7 +2077,7 @@ static irqreturn_t efx_ef10_msi_interrupt(int irq, void *dev_id)
        netif_vdbg(efx, intr, efx->net_dev,
                   "IRQ %d on CPU %d\n", irq, raw_smp_processor_id());
 
-       if (likely(ACCESS_ONCE(efx->irq_soft_enabled))) {
+       if (likely(READ_ONCE(efx->irq_soft_enabled))) {
                /* Note test interrupts */
                if (context->index == efx->irq_level)
                        efx->last_irq_cpu = raw_smp_processor_id();
@@ -2092,7 +2092,7 @@ static irqreturn_t efx_ef10_msi_interrupt(int irq, void *dev_id)
 static irqreturn_t efx_ef10_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);
        struct efx_channel *channel;
        efx_dword_t reg;
        u32 queues;
@@ -3299,7 +3299,7 @@ static int efx_ef10_handle_rx_event(struct efx_channel *channel,
        bool rx_cont;
        u16 flags = 0;
 
-       if (unlikely(ACCESS_ONCE(efx->reset_pending)))
+       if (unlikely(READ_ONCE(efx->reset_pending)))
                return 0;
 
        /* Basic packet information */
@@ -3436,7 +3436,7 @@ efx_ef10_handle_tx_event(struct efx_channel *channel, efx_qword_t *event)
        unsigned int tx_ev_q_label;
        int tx_descs = 0;
 
-       if (unlikely(ACCESS_ONCE(efx->reset_pending)))
+       if (unlikely(READ_ONCE(efx->reset_pending)))
                return 0;
 
        if (unlikely(EFX_QWORD_FIELD(*event, ESF_DZ_TX_DROP_EVENT)))
@@ -5324,7 +5324,7 @@ static void efx_ef10_filter_remove_old(struct efx_nic *efx)
        int i;
 
        for (i = 0; i < HUNT_FILTER_TBL_ROWS; i++) {
-               if (ACCESS_ONCE(table->entry[i].spec) &
+               if (READ_ONCE(table->entry[i].spec) &
                    EFX_EF10_FILTER_FLAG_AUTO_OLD) {
                        rc = efx_ef10_filter_remove_internal(efx,
                                        1U << EFX_FILTER_PRI_AUTO, i, true);