diff options
author | Greg Kroah-Hartman | 2018-09-16 22:04:13 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2018-09-16 22:04:13 +0200 |
commit | 7dc074348eb85d48f7a1fa96879458f4becf68a7 (patch) | |
tree | af626c941574ea68f7d74da04d81e302fbc14a68 /drivers/net/ethernet/amazon/ena/ena_eth_com.h | |
parent | MAINTAINERS: remove myself as staging FBTFT maintainer (diff) | |
parent | Linux 4.19-rc4 (diff) | |
download | kernel-qcow2-linux-7dc074348eb85d48f7a1fa96879458f4becf68a7.tar.gz kernel-qcow2-linux-7dc074348eb85d48f7a1fa96879458f4becf68a7.tar.xz kernel-qcow2-linux-7dc074348eb85d48f7a1fa96879458f4becf68a7.zip |
Merge 4.19-rc4 into staging-next
Handle the merge issues and take the iio and staging driver fixes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/amazon/ena/ena_eth_com.h')
-rw-r--r-- | drivers/net/ethernet/amazon/ena/ena_eth_com.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/amazon/ena/ena_eth_com.h b/drivers/net/ethernet/amazon/ena/ena_eth_com.h index 6fdc753d9483..2f7657227cfe 100644 --- a/drivers/net/ethernet/amazon/ena/ena_eth_com.h +++ b/drivers/net/ethernet/amazon/ena/ena_eth_com.h @@ -107,8 +107,7 @@ static inline int ena_com_sq_empty_space(struct ena_com_io_sq *io_sq) return io_sq->q_depth - 1 - cnt; } -static inline int ena_com_write_sq_doorbell(struct ena_com_io_sq *io_sq, - bool relaxed) +static inline int ena_com_write_sq_doorbell(struct ena_com_io_sq *io_sq) { u16 tail; @@ -117,10 +116,7 @@ static inline int ena_com_write_sq_doorbell(struct ena_com_io_sq *io_sq, pr_debug("write submission queue doorbell for queue: %d tail: %d\n", io_sq->qid, tail); - if (relaxed) - writel_relaxed(tail, io_sq->db_addr); - else - writel(tail, io_sq->db_addr); + writel(tail, io_sq->db_addr); return 0; } |