Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / net / ethernet / qlogic / qed / qed_spq.c

diff --git a/drivers/net/ethernet/qlogic/qed/qed_spq.c b/drivers/net/ethernet/qlogic/qed/qed_spq.c
index 3588081b2e274f2308eb795ca06632b9a5a442e8..cd9a0297ebc5a9021296777e3ede2b5446f97b93 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_spq.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_spq.c
@@ -97,9 +97,7 @@ static int __qed_spq_block(struct qed_hwfn *p_hwfn,
 
        while (iter_cnt--) {
                /* Validate we receive completion update */
-               if (READ_ONCE(comp_done->done) == 1) {
-                       /* Read updated FW return value */
-                       smp_read_barrier_depends();
+               if (smp_load_acquire(&comp_done->done) == 1) { /* ^^^ */
                        if (p_fw_ret)
                                *p_fw_ret = comp_done->fw_return_code;
                        return 0;