drivers/usb annotations and fixes

* endianness annotations
* endianness fixes
* missing get_unaligned/put_unaligned

It's pretty much all over the place, changes to different files are independent.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Serial-parts-Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

4 files changed, 16 insertions, 15 deletions

diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index fc6f3483be44..ce337cb5d137 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -328,6 +328,7 @@ udc_ep_enable(struct usb_ep *usbep, const struct usb_endpoint_descriptor *desc)
         u32                     tmp;
         unsigned long           iflags;
         u8 udc_csr_epix;
+        unsigned                maxpacket;
 
         if (!usbep
                         || usbep->name == ep0_string
@@ -354,9 +355,10 @@ udc_ep_enable(struct usb_ep *usbep, const struct usb_endpoint_descriptor *desc)
         writel(tmp, &dev->ep[ep->num].regs->ctl);
 
         /* set max packet size */
+        maxpacket = le16_to_cpu(desc->wMaxPacketSize);
         tmp = readl(&dev->ep[ep->num].regs->bufout_maxpkt);
-        tmp = AMD_ADDBITS(tmp, desc->wMaxPacketSize, UDC_EP_MAX_PKT_SIZE);
-        ep->ep.maxpacket = desc->wMaxPacketSize;
+        tmp = AMD_ADDBITS(tmp, maxpacket, UDC_EP_MAX_PKT_SIZE);
+        ep->ep.maxpacket = maxpacket;
         writel(tmp, &dev->ep[ep->num].regs->bufout_maxpkt);
 
         /* IN ep */
@@ -370,8 +372,8 @@ udc_ep_enable(struct usb_ep *usbep, const struct usb_endpoint_descriptor *desc)
                 /* double buffering: fifo size = 2 x max packet size */
                 tmp = AMD_ADDBITS(
                                 tmp,
-                                desc->wMaxPacketSize * UDC_EPIN_BUFF_SIZE_MULT
-                                                / UDC_DWORD_BYTES,
+                                maxpacket * UDC_EPIN_BUFF_SIZE_MULT
+                                          / UDC_DWORD_BYTES,
                                 UDC_EPIN_BUFF_SIZE);
                 writel(tmp, &dev->ep[ep->num].regs->bufin_framenum);
 
@@ -390,7 +392,7 @@ udc_ep_enable(struct usb_ep *usbep, const struct usb_endpoint_descriptor *desc)
 
                 /* set max packet size UDC CSR  */
                 tmp = readl(&dev->csr->ne[ep->num - UDC_CSR_EP_OUT_IX_OFS]);
-                tmp = AMD_ADDBITS(tmp, desc->wMaxPacketSize,
+                tmp = AMD_ADDBITS(tmp, maxpacket,
                                         UDC_CSR_NE_MAX_PKT);
                 writel(tmp, &dev->csr->ne[ep->num - UDC_CSR_EP_OUT_IX_OFS]);
 
@@ -407,7 +409,7 @@ udc_ep_enable(struct usb_ep *usbep, const struct usb_endpoint_descriptor *desc)
         /* set ep values */
         tmp = readl(&dev->csr->ne[udc_csr_epix]);
         /* max packet */
-        tmp = AMD_ADDBITS(tmp, desc->wMaxPacketSize, UDC_CSR_NE_MAX_PKT);
+        tmp = AMD_ADDBITS(tmp, maxpacket, UDC_CSR_NE_MAX_PKT);
         /* ep number */
         tmp = AMD_ADDBITS(tmp, desc->bEndpointAddress, UDC_CSR_NE_NUM);
         /* ep direction */
@@ -2832,7 +2834,7 @@ __acquires(dev->lock)
                 /* make usb request for gadget driver */
                 memset(&setup_data, 0 , sizeof(union udc_setup_data));
                 setup_data.request.bRequest = USB_REQ_SET_CONFIGURATION;
-                setup_data.request.wValue = dev->cur_config;
+                setup_data.request.wValue = cpu_to_le16(dev->cur_config);
 
                 /* programm the NE registers */
                 for (i = 0; i < UDC_EP_NUM; i++) {
@@ -2881,8 +2883,8 @@ __acquires(dev->lock)
                 memset(&setup_data, 0 , sizeof(union udc_setup_data));
                 setup_data.request.bRequest = USB_REQ_SET_INTERFACE;
                 setup_data.request.bRequestType = USB_RECIP_INTERFACE;
-                setup_data.request.wValue = dev->cur_alt;
-                setup_data.request.wIndex = dev->cur_intf;
+                setup_data.request.wValue = cpu_to_le16(dev->cur_alt);
+                setup_data.request.wIndex = cpu_to_le16(dev->cur_intf);
 
                 DBG(dev, "SET_INTERFACE interrupt: alt=%d intf=%d\n",
                                 dev->cur_alt, dev->cur_intf);
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 66293105d136..42036192a03c 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -1555,8 +1555,7 @@ hub_descriptor (struct usb_hub_descriptor *desc)
         memset (desc, 0, sizeof *desc);
         desc->bDescriptorType = 0x29;
         desc->bDescLength = 9;
-        desc->wHubCharacteristics = (__force __u16)
-                        (__constant_cpu_to_le16 (0x0001));
+        desc->wHubCharacteristics = cpu_to_le16(0x0001);
         desc->bNbrPorts = 1;
         desc->bitmap [0] = 0xff;
         desc->bitmap [1] = 0xff;
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index ff3a8513e64d..7f4d4828e3aa 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -229,7 +229,7 @@ static const struct usb_ac_header_descriptor_1 ac_header_desc = {
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubtype =   USB_MS_HEADER,
         .bcdADC =               __constant_cpu_to_le16(0x0100),
-        .wTotalLength =         USB_DT_AC_HEADER_SIZE(1),
+        .wTotalLength =         __constant_cpu_to_le16(USB_DT_AC_HEADER_SIZE(1)),
         .bInCollection =        1,
         .baInterfaceNr = {
                 [0] =           GMIDI_MS_INTERFACE,
@@ -253,9 +253,9 @@ static const struct usb_ms_header_descriptor ms_header_desc = {
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubtype =   USB_MS_HEADER,
         .bcdMSC =               __constant_cpu_to_le16(0x0100),
-        .wTotalLength =         USB_DT_MS_HEADER_SIZE
+        .wTotalLength =         __constant_cpu_to_le16(USB_DT_MS_HEADER_SIZE
                                 + 2*USB_DT_MIDI_IN_SIZE
-                                + 2*USB_DT_MIDI_OUT_SIZE(1),
+                                + 2*USB_DT_MIDI_OUT_SIZE(1)),
 };
 
 #define JACK_IN_EMB     1
diff --git a/drivers/usb/gadget/m66592-udc.h b/drivers/usb/gadget/m66592-udc.h
index be0a4c1f80a2..f118f00f1466 100644
--- a/drivers/usb/gadget/m66592-udc.h
+++ b/drivers/usb/gadget/m66592-udc.h
@@ -485,7 +485,7 @@ struct m66592 {
         struct m66592_ep        *epaddr2ep[16];
 
         struct usb_request      *ep0_req;       /* for internal request */
-        u16                     ep0_data;       /* for internal request */
+        __le16                  ep0_data;       /* for internal request */
         u16                     old_vbus;
 
         struct timer_list       timer;