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

[sfrench/cifs-2.6.git] / drivers / net / ethernet / sfc / falcon / nic.h

diff --git a/drivers/net/ethernet/sfc/falcon/nic.h b/drivers/net/ethernet/sfc/falcon/nic.h
index e2e3c008d0738287a67bc0fc8883ba9bb194d4cb..07c62dc552cb923749edba62c9ac3399cdc04681 100644 (file)
--- a/drivers/net/ethernet/sfc/falcon/nic.h
+++ b/drivers/net/ethernet/sfc/falcon/nic.h
@@ -83,7 +83,7 @@ static inline struct ef4_tx_queue *ef4_tx_queue_partner(struct ef4_tx_queue *tx_
 static inline bool __ef4_nic_tx_is_empty(struct ef4_tx_queue *tx_queue,
                                         unsigned int write_count)
 {
-       unsigned int empty_read_count = ACCESS_ONCE(tx_queue->empty_read_count);
+       unsigned int empty_read_count = READ_ONCE(tx_queue->empty_read_count);
 
        if (empty_read_count == 0)
                return false;
@@ -466,11 +466,11 @@ irqreturn_t ef4_farch_fatal_interrupt(struct ef4_nic *efx);
 
 static inline int ef4_nic_event_test_irq_cpu(struct ef4_channel *channel)
 {
-       return ACCESS_ONCE(channel->event_test_cpu);
+       return READ_ONCE(channel->event_test_cpu);
 }
 static inline int ef4_nic_irq_test_irq_cpu(struct ef4_nic *efx)
 {
-       return ACCESS_ONCE(efx->last_irq_cpu);
+       return READ_ONCE(efx->last_irq_cpu);
 }
 
 /* Global Resources */