5 files changed, 8 insertions, 8 deletions

diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index 4af90df8e7de..0f82fdcaef09 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -398,7 +398,7 @@ static void qh_lines (
         unsigned                size = *sizep;
         char                    *next = *nextp;
         char                    mark;
-        u32                     list_end = EHCI_LIST_END(ehci);
+        __le32                  list_end = EHCI_LIST_END(ehci);
 
         if (qh->hw_qtd_next == list_end)        /* NEC does this */
                 mark = '@';
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index efffef64f59d..f13d1029aeb2 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -530,7 +530,7 @@ ehci_hub_descriptor (
         if (HCS_INDICATOR (ehci->hcs_params))
                 temp |= 0x0080;         /* per-port indicators (LEDs) */
 #endif
-        desc->wHubCharacteristics = (__force __u16)cpu_to_le16 (temp);
+        desc->wHubCharacteristics = cpu_to_le16(temp);
 }
 
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 5ae689139dd0..b85b54160cda 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -285,7 +285,7 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
         int                     stopped;
         unsigned                count = 0;
         u8                      state;
-        u32                     halt = HALT_BIT(ehci);
+        __le32                  halt = HALT_BIT(ehci);
 
         if (unlikely (list_empty (&qh->qtd_list)))
                 return count;
@@ -883,7 +883,7 @@ static struct ehci_qh *qh_append_tds (
 )
 {
         struct ehci_qh          *qh = NULL;
-        u32                     qh_addr_mask = cpu_to_hc32(ehci, 0x7f);
+        __hc32                  qh_addr_mask = cpu_to_hc32(ehci, 0x7f);
 
         qh = (struct ehci_qh *) *ptr;
         if (unlikely (qh == NULL)) {
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index f4fa93dabdde..16667342b3c3 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -993,7 +993,7 @@ static void prepare_setup_packet(struct r8a66597 *r8a66597,
                                  struct r8a66597_td *td)
 {
         int i;
-        u16 *p = (u16 *)td->urb->setup_packet;
+        __le16 *p = (__le16 *)td->urb->setup_packet;
         unsigned long setup_addr = USBREQ;
 
         r8a66597_write(r8a66597, make_devsel(td->address) | td->maxpacket,
@@ -1001,7 +1001,7 @@ static void prepare_setup_packet(struct r8a66597 *r8a66597,
         r8a66597_write(r8a66597, ~(SIGN | SACK), INTSTS1);
 
         for (i = 0; i < 4; i++) {
-                r8a66597_write(r8a66597, cpu_to_le16(p[i]), setup_addr);
+                r8a66597_write(r8a66597, le16_to_cpu(p[i]), setup_addr);
                 setup_addr += 2;
         }
         r8a66597_write(r8a66597, SUREQ, DCPCTR);
@@ -2131,7 +2131,7 @@ static int r8a66597_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
         case GetPortStatus:
                 if (wIndex > R8A66597_MAX_ROOT_HUB)
                         goto error;
-                *(u32 *)buf = cpu_to_le32(rh->port);
+                *(__le32 *)buf = cpu_to_le32(rh->port);
                 break;
         case SetPortFeature:
                 if (wIndex > R8A66597_MAX_ROOT_HUB)
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 274276cf8621..3fd7a0c12078 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1100,7 +1100,7 @@ sl811h_hub_descriptor (
         /* no overcurrent errors detection/handling */
         temp |= 0x0010;
 
-        desc->wHubCharacteristics = (__force __u16)cpu_to_le16(temp);
+        desc->wHubCharacteristics = cpu_to_le16(temp);
 
         /* two bitmaps:  ports removable, and legacy PortPwrCtrlMask */
         desc->bitmap[0] = 0 << 1;