Merge remote-tracking branch 'keys/keys-next'

[deliverable/linux.git] / drivers / net / ethernet / intel / fm10k / fm10k_iov.c

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
index 47f0743ec03b8f38f9cd3012a0cbc14bb8e3eb2a..d9dec81f6b6d01dbd8f0fdbd1390692210597741 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
@@ -51,7 +51,7 @@ s32 fm10k_iov_event(struct fm10k_intfc *interface)
        int i;
 
        /* if there is no iov_data then there is no mailbox to process */
-       if (!ACCESS_ONCE(interface->iov_data))
+       if (!READ_ONCE(interface->iov_data))
                return 0;
 
        rcu_read_lock();
@@ -99,7 +99,7 @@ s32 fm10k_iov_mbx(struct fm10k_intfc *interface)
        int i;
 
        /* if there is no iov_data then there is no mailbox to process */
-       if (!ACCESS_ONCE(interface->iov_data))
+       if (!READ_ONCE(interface->iov_data))
                return 0;
 
        rcu_read_lock();