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>

7 files changed, 21 insertions, 18 deletions

diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index a238817762ad..9b1bb347dc2d 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -209,7 +209,7 @@ static void aircable_send(struct usb_serial_port *port)
         int count, result;
         struct aircable_private *priv = usb_get_serial_port_data(port);
         unsigned char* buf;
-        u16 *dbuf;
+        __le16 *dbuf;
         dbg("%s - port %d", __func__, port->number);
         if (port->write_urb_busy)
                 return;
@@ -227,7 +227,7 @@ static void aircable_send(struct usb_serial_port *port)
 
         buf[0] = TX_HEADER_0;
         buf[1] = TX_HEADER_1;
-        dbuf = (u16 *)&buf[2];
+        dbuf = (__le16 *)&buf[2];
         *dbuf = cpu_to_le16((u16)count);
         serial_buf_get(priv->tx_buf,buf + HCI_HEADER_LENGTH, MAX_HCI_FRAMESIZE);
 
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 32121794808d..0230d3c0888a 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -541,7 +541,7 @@ static int cypress_earthmate_startup (struct usb_serial *serial)
         /* All Earthmate devices use the separated-count packet
            format!  Idiotic. */
         priv->pkt_fmt = packet_format_1;
-        if (serial->dev->descriptor.idProduct != PRODUCT_ID_EARTHMATEUSB) {
+        if (serial->dev->descriptor.idProduct != cpu_to_le16(PRODUCT_ID_EARTHMATEUSB)) {
                 /* The old original USB Earthmate seemed able to
                    handle GET_CONFIG requests; everything they've
                    produced since that time crashes if this command is
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 23f51a41093e..c7329f43d9c9 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1104,7 +1104,7 @@ static int ftdi_mtxorb_hack_setup(struct usb_serial *serial)
         struct usb_endpoint_descriptor *ep_desc = &ep->desc;
 
         if (ep->enabled && ep_desc->wMaxPacketSize == 0) {
-                ep_desc->wMaxPacketSize = 0x40;
+                ep_desc->wMaxPacketSize = cpu_to_le16(0x40);
                 info("Fixing invalid wMaxPacketSize on read pipe");
         }
 
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index ce2e487f3240..06b52f4098f1 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -2993,7 +2993,7 @@ static int edge_startup (struct usb_serial *serial)
                                 usb_fill_bulk_urb(edge_serial->read_urb, dev,
                                                   usb_rcvbulkpipe(dev, endpoint->bEndpointAddress),
                                                   edge_serial->bulk_in_buffer,
-                                                  endpoint->wMaxPacketSize,
+                                                  le16_to_cpu(endpoint->wMaxPacketSize),
                                                   edge_bulk_in_callback,
                                                   edge_serial);
                                 bulk_in_found = true;
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index b395ac759888..f328948d74e3 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -54,6 +54,7 @@
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <asm/uaccess.h>
+#include <asm/unaligned.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include "kl5kusb105.h"
@@ -235,7 +236,7 @@ static int klsi_105_get_line_state(struct usb_serial_port *port,
         if (rc < 0)
                 err("Reading line status failed (error = %d)", rc);
         else {
-                status = le16_to_cpu(*(u16 *)status_buf);
+                status = le16_to_cpu(get_unaligned((__le16 *)status_buf));
 
                 info("%s - read status %x %x", __func__,
                      status_buf[0], status_buf[1]);
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index d92bb6501c84..a9625c180dc3 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -98,7 +98,7 @@ struct oti6858_buf {
 
 /* format of the control packet */
 struct oti6858_control_pkt {
-        u16     divisor;        /* baud rate = 96000000 / (16 * divisor), LE */
+        __le16  divisor;        /* baud rate = 96000000 / (16 * divisor), LE */
 #define OTI6858_MAX_BAUD_RATE   3000000
         u8      frame_fmt;
 #define FMT_STOP_BITS_MASK      0xc0
@@ -211,7 +211,7 @@ struct oti6858_private {
         struct delayed_work delayed_write_work;
 
         struct {
-                u16 divisor;
+                __le16 divisor;
                 u8 frame_fmt;
                 u8 control;
         } pending_setup;
@@ -450,7 +450,7 @@ static void oti6858_set_termios(struct usb_serial_port *port,
         unsigned long flags;
         unsigned int cflag;
         u8 frame_fmt, control;
-        u16 divisor;
+        __le16 divisor;
         int br;
 
         dbg("%s(port = %d)", __func__, port->number);
@@ -505,11 +505,12 @@ static void oti6858_set_termios(struct usb_serial_port *port,
                 divisor = 0;
         } else {
                 int real_br;
+                int new_divisor;
                 br = min(br, OTI6858_MAX_BAUD_RATE);
 
-                divisor = (96000000 + 8 * br) / (16 * br);
-                real_br = 96000000 / (16 * divisor);
-                divisor = cpu_to_le16(divisor);
+                new_divisor = (96000000 + 8 * br) / (16 * br);
+                real_br = 96000000 / (16 * new_divisor);
+                divisor = cpu_to_le16(new_divisor);
                 tty_encode_baud_rate(port->tty, real_br, real_br);
         }
 
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index 2282d620186e..55b2570b8b8b 100644
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -310,17 +310,18 @@ static int spcp8x5_startup(struct usb_serial *serial)
         struct spcp8x5_private *priv;
         int i;
         enum spcp8x5_type type = SPCP825_007_TYPE;
+        u16 product = le16_to_cpu(serial->dev->descriptor.idProduct);
 
-        if (serial->dev->descriptor.idProduct == 0x0201)
+        if (product == 0x0201)
                 type = SPCP825_007_TYPE;
-        else if (serial->dev->descriptor.idProduct == 0x0231)
+        else if (product == 0x0231)
                 type = SPCP835_TYPE;
-        else if (serial->dev->descriptor.idProduct == 0x0235)
+        else if (product == 0x0235)
                 type = SPCP825_008_TYPE;
-        else if (serial->dev->descriptor.idProduct == 0x0204)
+        else if (product == 0x0204)
                 type = SPCP825_INTERMATIC_TYPE;
-        else if (serial->dev->descriptor.idProduct == 0x0471 &&
-                 serial->dev->descriptor.idVendor == 0x081e)
+        else if (product == 0x0471 &&
+                 serial->dev->descriptor.idVendor == cpu_to_le16(0x081e))
                 type = SPCP825_PHILIP_TYPE;
         dev_dbg(&serial->dev->dev, "device type = %d\n", (int)type);