diff options
author | Mark Brown <broonie@kernel.org> | 2019-05-20 11:54:11 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-05-20 11:54:11 +0100 |
commit | 96d82e9d0dc799bb382ed0fe9db30c79c3a9f3b9 (patch) | |
tree | 76a630c2f0c84d807cc2c6199be24519ecc9ec16 /include/linux/qed/qed_if.h | |
parent | 977bfde5d4cbb9d2eb1969eb2eb671cdb9b9fcbf (diff) | |
parent | a188339ca5a396acc588e5851ed7e19f66b0ebd9 (diff) |
Merge tag 'v5.2-rc1' into regulator-5.3
Linux 5.2-rc1
Diffstat (limited to 'include/linux/qed/qed_if.h')
-rw-r--r-- | include/linux/qed/qed_if.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/qed/qed_if.h b/include/linux/qed/qed_if.h index f6165d304b4d..48841e5dab90 100644 --- a/include/linux/qed/qed_if.h +++ b/include/linux/qed/qed_if.h @@ -1338,7 +1338,6 @@ static inline u16 qed_sb_update_sb_idx(struct qed_sb_info *sb_info) } /* Let SB update */ - mmiowb(); return rc; } @@ -1374,7 +1373,6 @@ static inline void qed_sb_ack(struct qed_sb_info *sb_info, /* Both segments (interrupts & acks) are written to same place address; * Need to guarantee all commands will be received (in-order) by HW. */ - mmiowb(); barrier(); } |