Merge branch 'linus' into locking/core, to resolve conflicts

[sfrench/cifs-2.6.git] / drivers / usb / host / uhci-hcd.h

diff --git a/drivers/usb/host/uhci-hcd.h b/drivers/usb/host/uhci-hcd.h
index d97f0d9b3ce6ce0ec29ad1d79531082c0e392d9f..f1cc47292a59e9a3887ec7338dbdabf327773d1b 100644 (file)
--- a/drivers/usb/host/uhci-hcd.h
+++ b/drivers/usb/host/uhci-hcd.h
@@ -187,7 +187,7 @@ struct uhci_qh {
  * We need a special accessor for the element pointer because it is
  * subject to asynchronous updates by the controller.
  */
-#define qh_element(qh)         ACCESS_ONCE((qh)->element)
+#define qh_element(qh)         READ_ONCE((qh)->element)
 
 #define LINK_TO_QH(uhci, qh)   (UHCI_PTR_QH((uhci)) | \
                                cpu_to_hc32((uhci), (qh)->dma_handle))
@@ -275,7 +275,7 @@ struct uhci_td {
  * subject to asynchronous updates by the controller.
  */
 #define td_status(uhci, td)            hc32_to_cpu((uhci), \
-                                               ACCESS_ONCE((td)->status))
+                                               READ_ONCE((td)->status))
 
 #define LINK_TO_TD(uhci, td)           (cpu_to_hc32((uhci), (td)->dma_handle))