Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (149 commits)
  USB: ohci-pnx4008: Remove unnecessary cast of return value of kzalloc
  USB: additions to the quirk list
  usb-storage: implement autosuspend
  USB: cdc-acm: add new device id to option driver
  USB: goku_udc trivial cleanups
  USB: usb gadget stack can now -DDEBUG with Kconfig
  usb gadget stack: remove usb_ep_*_buffer(), part 2
  usb gadget stack: remove usb_ep_*_buffer(), part 1
  USB: pxa2xx_udc -- cleanups, mostly removing dma hooks
  USB: pxa2xx_udc: use generic gpio layer
  USB: quirk for samsung printer
  USB: usb/dma doc updates
  USB: drivers/usb/storage/unusual_devs.h whitespace cleanup
  USB: remove Makefile reference to obsolete OHCI_AT91
  USB: io_*: remove bogus termios no change checks
  USB: mos7720: remove bogus no termios change check
  USB: visor and whiteheat: remove bogus termios change checks
  USB: pl2303: remove bogus checks and fix speed support to use tty_get_baud_rate()
  USB: mos7840.c: turn this into a serial driver
  USB: make the usb_device numa_node get assigned from controller
  ...

1 files changed, 19 insertions, 87 deletions

diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 36620c651079..37f41f576d3d 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -434,6 +434,7 @@ static void mos7840_control_callback(struct urb *urb)
         struct moschip_port *mos7840_port;
         __u8 regval = 0x0;
         int result = 0;
+        int status = urb->status;
 
         if (!urb) {
                 dbg("%s", "Invalid Pointer !!!!:\n");
@@ -442,7 +443,7 @@ static void mos7840_control_callback(struct urb *urb)
 
         mos7840_port = (struct moschip_port *)urb->context;
 
-        switch (urb->status) {
+        switch (status) {
         case 0:
                 /* success */
                 break;
@@ -451,11 +452,11 @@ static void mos7840_control_callback(struct urb *urb)
         case -ESHUTDOWN:
                 /* this urb is terminated, clean up */
                 dbg("%s - urb shutting down with status: %d", __FUNCTION__,
-                    urb->status);
+                    status);
                 return;
         default:
                 dbg("%s - nonzero urb status received: %d", __FUNCTION__,
-                    urb->status);
+                    status);
                 goto exit;
         }
 
@@ -521,6 +522,7 @@ static void mos7840_interrupt_callback(struct urb *urb)
         __u8 sp[5], st;
         int i, rv = 0;
         __u16 wval, wreg = 0;
+        int status = urb->status;
 
         dbg("%s", " : Entering\n");
         if (!urb) {
@@ -528,7 +530,7 @@ static void mos7840_interrupt_callback(struct urb *urb)
                 return;
         }
 
-        switch (urb->status) {
+        switch (status) {
         case 0:
                 /* success */
                 break;
@@ -537,11 +539,11 @@ static void mos7840_interrupt_callback(struct urb *urb)
         case -ESHUTDOWN:
                 /* this urb is terminated, clean up */
                 dbg("%s - urb shutting down with status: %d", __FUNCTION__,
-                    urb->status);
+                    status);
                 return;
         default:
                 dbg("%s - nonzero urb status received: %d", __FUNCTION__,
-                    urb->status);
+                    status);
                 goto exit;
         }
 
@@ -666,20 +668,21 @@ static struct usb_serial *mos7840_get_usb_serial(struct usb_serial_port *port,
 
 static void mos7840_bulk_in_callback(struct urb *urb)
 {
-        int status;
+        int retval;
         unsigned char *data;
         struct usb_serial *serial;
         struct usb_serial_port *port;
         struct moschip_port *mos7840_port;
         struct tty_struct *tty;
+        int status = urb->status;
 
         if (!urb) {
                 dbg("%s", "Invalid Pointer !!!!:\n");
                 return;
         }
 
-        if (urb->status) {
-                dbg("nonzero read bulk status received: %d", urb->status);
+        if (status) {
+                dbg("nonzero read bulk status received: %d", status);
                 return;
         }
 
@@ -729,11 +732,11 @@ static void mos7840_bulk_in_callback(struct urb *urb)
 
         mos7840_port->read_urb->dev = serial->dev;
 
-        status = usb_submit_urb(mos7840_port->read_urb, GFP_ATOMIC);
+        retval = usb_submit_urb(mos7840_port->read_urb, GFP_ATOMIC);
 
-        if (status) {
-                dbg(" usb_submit_urb(read bulk) failed, status = %d",
-                 status);
+        if (retval) {
+                dbg(" usb_submit_urb(read bulk) failed, retval = %d",
+                 retval);
         }
 }
 
@@ -747,6 +750,7 @@ static void mos7840_bulk_out_data_callback(struct urb *urb)
 {
         struct moschip_port *mos7840_port;
         struct tty_struct *tty;
+        int status = urb->status;
         int i;
 
         if (!urb) {
@@ -764,8 +768,8 @@ static void mos7840_bulk_out_data_callback(struct urb *urb)
         }
         spin_unlock(&mos7840_port->pool_lock);
 
-        if (urb->status) {
-                dbg("nonzero write bulk status received:%d\n", urb->status);
+        if (status) {
+                dbg("nonzero write bulk status received:%d\n", status);
                 return;
         }
 
@@ -2185,16 +2189,6 @@ static void mos7840_set_termios(struct usb_serial_port *port,
                 return;
         }
 
-        /* check that they really want us to change something */
-        if (old_termios) {
-                if ((cflag == old_termios->c_cflag) &&
-                    (RELEVANT_IFLAG(tty->termios->c_iflag) ==
-                     RELEVANT_IFLAG(old_termios->c_iflag))) {
-                        dbg("%s\n", "Nothing to change");
-                        return;
-                }
-        }
-
         dbg("%s - clfag %08x iflag %08x", __FUNCTION__,
             tty->termios->c_cflag, RELEVANT_IFLAG(tty->termios->c_iflag));
 
@@ -2254,30 +2248,6 @@ static int mos7840_get_lsr_info(struct moschip_port *mos7840_port,
 }
 
 /*****************************************************************************
- * mos7840_get_bytes_avail - get number of bytes available
- *
- * Purpose: Let user call ioctl to get the count of number of bytes available.
- *****************************************************************************/
-
-static int mos7840_get_bytes_avail(struct moschip_port *mos7840_port,
-                                   unsigned int __user *value)
-{
-        unsigned int result = 0;
-        struct tty_struct *tty = mos7840_port->port->tty;
-
-        if (!tty)
-                return -ENOIOCTLCMD;
-
-        result = tty->read_cnt;
-
-        dbg("%s(%d) = %d", __FUNCTION__, mos7840_port->port->number, result);
-        if (copy_to_user(value, &result, sizeof(int)))
-                return -EFAULT;
-
-        return -ENOIOCTLCMD;
-}
-
-/*****************************************************************************
  * mos7840_set_modem_info
  *      function to set modem info
  *****************************************************************************/
@@ -2425,8 +2395,6 @@ static int mos7840_ioctl(struct usb_serial_port *port, struct file *file,
         struct async_icount cprev;
         struct serial_icounter_struct icount;
         int mosret = 0;
-        int retval;
-        struct tty_ldisc *ld;
 
         if (mos7840_port_paranoia_check(port, __FUNCTION__)) {
                 dbg("%s", "Invalid port \n");
@@ -2445,42 +2413,6 @@ static int mos7840_ioctl(struct usb_serial_port *port, struct file *file,
         switch (cmd) {
                 /* return number of bytes available */
 
-        case TIOCINQ:
-                dbg("%s (%d) TIOCINQ", __FUNCTION__, port->number);
-                return mos7840_get_bytes_avail(mos7840_port, argp);
-
-        case TIOCOUTQ:
-                dbg("%s (%d) TIOCOUTQ", __FUNCTION__, port->number);
-                return put_user(tty->driver->chars_in_buffer ?
-                                tty->driver->chars_in_buffer(tty) : 0,
-                                (int __user *)arg);
-
-        case TCFLSH:
-                retval = tty_check_change(tty);
-                if (retval)
-                        return retval;
-
-                ld = tty_ldisc_ref(tty);
-                switch (arg) {
-                case TCIFLUSH:
-                        if (ld && ld->flush_buffer)
-                                ld->flush_buffer(tty);
-                        break;
-                case TCIOFLUSH:
-                        if (ld && ld->flush_buffer)
-                                ld->flush_buffer(tty);
-                        /* fall through */
-                case TCOFLUSH:
-                        if (tty->driver->flush_buffer)
-                                tty->driver->flush_buffer(tty);
-                        break;
-                default:
-                        tty_ldisc_deref(ld);
-                        return -EINVAL;
-                }
-                tty_ldisc_deref(ld);
-                return 0;
-
         case TIOCSERGETLSR:
                 dbg("%s (%d) TIOCSERGETLSR", __FUNCTION__, port->number);
                 return mos7840_get_lsr_info(mos7840_port, argp);