usb: use get/put_unaligned_* helpers

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 17 insertions, 27 deletions

diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 64a592cbbe7b..be6613afedbf 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -127,7 +127,7 @@ goku_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
 
         /* enabling the no-toggle interrupt mode would need an api hook */
         mode = 0;
-        max = le16_to_cpu(get_unaligned(&desc->wMaxPacketSize));
+        max = get_unaligned_le16(&desc->wMaxPacketSize);
         switch (max) {
         case 64:        mode++;
         case 32:        mode++;
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index bd58dd504f6f..d0677f5d3cd5 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -183,14 +183,10 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
                 DBG("query OID %08x value, len %d:\n", OID, buf_len);
                 for (i = 0; i < buf_len; i += 16) {
                         DBG("%03d: %08x %08x %08x %08x\n", i,
-                                le32_to_cpu(get_unaligned((__le32 *)
-                                        &buf[i])),
-                                le32_to_cpu(get_unaligned((__le32 *)
-                                        &buf[i + 4])),
-                                le32_to_cpu(get_unaligned((__le32 *)
-                                        &buf[i + 8])),
-                                le32_to_cpu(get_unaligned((__le32 *)
-                                        &buf[i + 12])));
+                                get_unaligned_le32(&buf[i]),
+                                get_unaligned_le32(&buf[i + 4]),
+                                get_unaligned_le32(&buf[i + 8]),
+                                get_unaligned_le32(&buf[i + 12]));
                 }
         }
 
@@ -666,7 +662,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
                 break;
         case OID_PNP_QUERY_POWER:
                 DBG("%s: OID_PNP_QUERY_POWER D%d\n", __func__,
-                                le32_to_cpu(get_unaligned((__le32 *)buf)) - 1);
+                                get_unaligned_le32(buf) - 1);
                 /* only suspend is a real power state, and
                  * it can't be entered by OID_PNP_SET_POWER...
                  */
@@ -705,14 +701,10 @@ static int gen_ndis_set_resp (u8 configNr, u32 OID, u8 *buf, u32 buf_len,
                 DBG("set OID %08x value, len %d:\n", OID, buf_len);
                 for (i = 0; i < buf_len; i += 16) {
                         DBG("%03d: %08x %08x %08x %08x\n", i,
-                                le32_to_cpu(get_unaligned((__le32 *)
-                                        &buf[i])),
-                                le32_to_cpu(get_unaligned((__le32 *)
-                                        &buf[i + 4])),
-                                le32_to_cpu(get_unaligned((__le32 *)
-                                        &buf[i + 8])),
-                                le32_to_cpu(get_unaligned((__le32 *)
-                                        &buf[i + 12])));
+                                get_unaligned_le32(&buf[i]),
+                                get_unaligned_le32(&buf[i + 4]),
+                                get_unaligned_le32(&buf[i + 8]),
+                                get_unaligned_le32(&buf[i + 12]));
                 }
         }
 
@@ -726,8 +718,7 @@ static int gen_ndis_set_resp (u8 configNr, u32 OID, u8 *buf, u32 buf_len,
                  *      PROMISCUOUS, DIRECTED,
                  *      MULTICAST, ALL_MULTICAST, BROADCAST
                  */
-                *params->filter = (u16) le32_to_cpu(get_unaligned(
-                                (__le32 *)buf));
+                *params->filter = (u16)get_unaligned_le32(buf);
                 DBG("%s: OID_GEN_CURRENT_PACKET_FILTER %08x\n",
                         __func__, *params->filter);
 
@@ -777,7 +768,7 @@ update_linkstate:
                  * resuming, Windows forces a reset, and then SET_POWER D0.
                  * FIXME ... then things go batty; Windows wedges itself.
                  */
-                i = le32_to_cpu(get_unaligned((__le32 *)buf));
+                i = get_unaligned_le32(buf);
                 DBG("%s: OID_PNP_SET_POWER D%d\n", __func__, i - 1);
                 switch (i) {
                 case NdisDeviceStateD0:
@@ -1064,8 +1055,8 @@ int rndis_msg_parser (u8 configNr, u8 *buf)
                 return -ENOMEM;
 
         tmp = (__le32 *) buf;
-        MsgType   = le32_to_cpu(get_unaligned(tmp++));
-        MsgLength = le32_to_cpu(get_unaligned(tmp++));
+        MsgType   = get_unaligned_le32(tmp++);
+        MsgLength = get_unaligned_le32(tmp++);
 
         if (configNr >= RNDIS_MAX_CONFIGS)
                 return -ENOTSUPP;
@@ -1296,10 +1287,9 @@ int rndis_rm_hdr(struct sk_buff *skb)
         tmp++;
 
         /* DataOffset, DataLength */
-        if (!skb_pull(skb, le32_to_cpu(get_unaligned(tmp++))
-                        + 8 /* offset of DataOffset */))
+        if (!skb_pull(skb, get_unaligned_le32(tmp++) + 8))
                 return -EOVERFLOW;
-        skb_trim(skb, le32_to_cpu(get_unaligned(tmp++)));
+        skb_trim(skb, get_unaligned_le32(tmp++));
 
         return 0;
 }
diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c
index 878e428a0ec1..4154be375c7a 100644
--- a/drivers/usb/gadget/usbstring.c
+++ b/drivers/usb/gadget/usbstring.c
@@ -74,7 +74,7 @@ static int utf8_to_utf16le(const char *s, __le16 *cp, unsigned len)
                                 goto fail;
                 } else
                         uchar = c;
-                put_unaligned (cpu_to_le16 (uchar), cp++);
+                put_unaligned_le16(uchar, cp++);
                 count++;
                 len--;
         }