xhci: replace xhci_write_64() with writeq()

Function xhci_write_64() is used to write 64bit xHC registers residing in MMIO.
On 32bit systems, xHC registers need to be written with 32bit accesses by
writing first the lower 32bits and then the higher 32bits. The header file
asm-generic/io-64-nonatomic-lo-hi.h ensures that on 32bit systems writeq() will
will write 64bit registers in 32bit chunks with low-high order.

Replace all calls to xhci_write_64() with calls to writeq().

This is done to reduce code duplication since 64bit low-high write logic
is already implemented and to take advantage of inherent "atomic" 64bit
write operations on 64bit systems.

Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 339733b8524a..fe9208a5d103 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -319,8 +319,7 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci)
                 return 0;
         }
         xhci->cmd_ring_state = CMD_RING_STATE_ABORTED;
-        xhci_write_64(xhci, temp_64 | CMD_RING_ABORT,
-                        &xhci->op_regs->cmd_ring);
+        writeq(temp_64 | CMD_RING_ABORT, &xhci->op_regs->cmd_ring);
 
         /* Section 4.6.1.2 of xHCI 1.0 spec says software should
          * time the completion od all xHCI commands, including
@@ -2872,8 +2871,7 @@ hw_died:
                  * the event ring should be empty.
                  */
                 temp_64 = readq(&xhci->ir_set->erst_dequeue);
-                xhci_write_64(xhci, temp_64 | ERST_EHB,
-                                &xhci->ir_set->erst_dequeue);
+                writeq(temp_64 | ERST_EHB, &xhci->ir_set->erst_dequeue);
                 spin_unlock(&xhci->lock);
 
                 return IRQ_HANDLED;
@@ -2900,7 +2898,7 @@ hw_died:
 
         /* Clear the event handler busy flag (RW1C); event ring is empty. */
         temp_64 |= ERST_EHB;
-        xhci_write_64(xhci, temp_64, &xhci->ir_set->erst_dequeue);
+        writeq(temp_64, &xhci->ir_set->erst_dequeue);
 
         spin_unlock(&xhci->lock);