187 files changed, 1782 insertions, 1270 deletions
diff --git a/drivers/bluetooth/hci_ath.c b/drivers/bluetooth/hci_ath.c
index 6a160c17ea94..bd34406faaae 100644
--- a/drivers/bluetooth/hci_ath.c
+++ b/drivers/bluetooth/hci_ath.c
@@ -51,32 +51,32 @@ struct ath_struct {
 static int ath_wakeup_ar3k(struct tty_struct *tty)
 {
-        struct termios settings;
+        struct ktermios ktermios;
-        int status = tty->driver->ops->tiocmget(tty, NULL);
+        int status = tty->driver->ops->tiocmget(tty);
        if (status & TIOCM_CTS)
                return status;
        /* Disable Automatic RTSCTS */
-        n_tty_ioctl_helper(tty, NULL, TCGETS, (unsigned long)&settings);
+        memcpy(&ktermios, tty->termios, sizeof(ktermios));
-        settings.c_cflag &= ~CRTSCTS;
+        ktermios.c_cflag &= ~CRTSCTS;
-        n_tty_ioctl_helper(tty, NULL, TCSETS, (unsigned long)&settings);
+        tty_set_termios(tty, &ktermios);
        /* Clear RTS first */
-        status = tty->driver->ops->tiocmget(tty, NULL);
+        status = tty->driver->ops->tiocmget(tty);
-        tty->driver->ops->tiocmset(tty, NULL, 0x00, TIOCM_RTS);
+        tty->driver->ops->tiocmset(tty, 0x00, TIOCM_RTS);
        mdelay(20);
        /* Set RTS, wake up board */
-        status = tty->driver->ops->tiocmget(tty, NULL);
+        status = tty->driver->ops->tiocmget(tty);
-        tty->driver->ops->tiocmset(tty, NULL, TIOCM_RTS, 0x00);
+        tty->driver->ops->tiocmset(tty, TIOCM_RTS, 0x00);
        mdelay(20);
-        status = tty->driver->ops->tiocmget(tty, NULL);
+        status = tty->driver->ops->tiocmget(tty);
-        n_tty_ioctl_helper(tty, NULL, TCGETS, (unsigned long)&settings);
+        /* Disable Automatic RTSCTS */
-        settings.c_cflag |= CRTSCTS;
+        ktermios.c_cflag |= CRTSCTS;
-        n_tty_ioctl_helper(tty, NULL, TCSETS, (unsigned long)&settings);
+        status = tty_set_termios(tty, &ktermios);
        return status;
 }
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index b7980a83ce2d..04f8b2d083c6 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -4,89 +4,7 @@
 menu "Character devices"
-config VT
+source "drivers/tty/Kconfig"
-        bool "Virtual terminal" if EXPERT
-        depends on !S390
-        select INPUT
-        default y
-        ---help---
-          If you say Y here, you will get support for terminal devices with
-          display and keyboard devices. These are called "virtual" because you
-          can run several virtual terminals (also called virtual consoles) on
-          one physical terminal. This is rather useful, for example one
-          virtual terminal can collect system messages and warnings, another
-          one can be used for a text-mode user session, and a third could run
-          an X session, all in parallel. Switching between virtual terminals
-          is done with certain key combinations, usually Alt-<function key>.
-          The setterm command ("man setterm") can be used to change the
-          properties (such as colors or beeping) of a virtual terminal. The
-          man page console_codes(4) ("man console_codes") contains the special
-          character sequences that can be used to change those properties
-          directly. The fonts used on virtual terminals can be changed with
-          the setfont ("man setfont") command and the key bindings are defined
-          with the loadkeys ("man loadkeys") command.
-          You need at least one virtual terminal device in order to make use
-          of your keyboard and monitor. Therefore, only people configuring an
-          embedded system would want to say N here in order to save some
-          memory; the only way to log into such a system is then via a serial
-          or network connection.
-          If unsure, say Y, or else you won't be able to do much with your new
-          shiny Linux system :-)
-config CONSOLE_TRANSLATIONS
-        depends on VT
-        default y
-        bool "Enable character translations in console" if EXPERT
-        ---help---
-          This enables support for font mapping and Unicode translation
-          on virtual consoles.
-config VT_CONSOLE
-        bool "Support for console on virtual terminal" if EXPERT
-        depends on VT
-        default y
-        ---help---
-          The system console is the device which receives all kernel messages
-          and warnings and which allows logins in single user mode. If you
-          answer Y here, a virtual terminal (the device used to interact with
-          a physical terminal) can be used as system console. This is the most
-          common mode of operations, so you should say Y here unless you want
-          the kernel messages be output only to a serial port (in which case
-          you should say Y to "Console on serial port", below).
-          If you do say Y here, by default the currently visible virtual
-          terminal (/dev/tty0) will be used as system console. You can change
-          that with a kernel command line option such as "console=tty3" which
-          would use the third virtual terminal as system console. (Try "man
-          bootparam" or see the documentation of your boot loader (lilo or
-          loadlin) about how to pass options to the kernel at boot time.)
-          If unsure, say Y.
-config HW_CONSOLE
-        bool
-        depends on VT && !S390 && !UML
-        default y
-config VT_HW_CONSOLE_BINDING
-       bool "Support for binding and unbinding console drivers"
-       depends on HW_CONSOLE
-       default n
-       ---help---
-         The virtual terminal is the device that interacts with the physical
-         terminal through console drivers. On these systems, at least one
-         console driver is loaded. In other configurations, additional console
-         drivers may be enabled, such as the framebuffer console. If more than
-         1 console driver is enabled, setting this to 'y' will allow you to
-         select the console driver that will serve as the backend for the
-         virtual terminals.
-         See <file:Documentation/console/console.txt> for more
-         information. For framebuffer console users, please refer to
-         <file:Documentation/fb/fbcon.txt>.
 config DEVKMEM
        bool "/dev/kmem virtual device support"
@@ -97,253 +15,6 @@ config DEVKMEM
          kind of kernel debugging operations.
          When in doubt, say "N".
-config BFIN_JTAG_COMM
-        tristate "Blackfin JTAG Communication"
-        depends on BLACKFIN
-        help
-          Add support for emulating a TTY device over the Blackfin JTAG.
-          To compile this driver as a module, choose M here: the
-          module will be called bfin_jtag_comm.
-config BFIN_JTAG_COMM_CONSOLE
-        bool "Console on Blackfin JTAG"
-        depends on BFIN_JTAG_COMM=y
-config SERIAL_NONSTANDARD
-        bool "Non-standard serial port support"
-        depends on HAS_IOMEM
-        ---help---
-          Say Y here if you have any non-standard serial boards -- boards
-          which aren't supported using the standard "dumb" serial driver.
-          This includes intelligent serial boards such as Cyclades,
-          Digiboards, etc. These are usually used for systems that need many
-          serial ports because they serve many terminals or dial-in
-          connections.
-          Note that the answer to this question won't directly affect the
-          kernel: saying N will just cause the configurator to skip all
-          the questions about non-standard serial boards.
-          Most people can say N here.
-config COMPUTONE
-        tristate "Computone IntelliPort Plus serial support"
-        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
-        ---help---
-          This driver supports the entire family of Intelliport II/Plus
-          controllers with the exception of the MicroChannel controllers and
-          products previous to the Intelliport II. These are multiport cards,
-          which give you many serial ports. You would need something like this
-          to connect more than two modems to your Linux box, for instance in
-          order to become a dial-in server. If you have a card like that, say
-          Y here and read <file:Documentation/serial/computone.txt>.
-          To compile this driver as module, choose M here: the
-          module will be called ip2.
-config ROCKETPORT
-        tristate "Comtrol RocketPort support"
-        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
-        help
-          This driver supports Comtrol RocketPort and RocketModem PCI boards.   
-          These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
-          modems.  For information about the RocketPort/RocketModem  boards
-          and this driver read <file:Documentation/serial/rocket.txt>.
-          To compile this driver as a module, choose M here: the
-          module will be called rocket.
-          If you want to compile this driver into the kernel, say Y here.  If
-          you don't have a Comtrol RocketPort/RocketModem card installed, say N.
-config CYCLADES
-        tristate "Cyclades async mux support"
-        depends on SERIAL_NONSTANDARD && (PCI || ISA)
-        select FW_LOADER
-        ---help---
-          This driver supports Cyclades Z and Y multiserial boards.
-          You would need something like this to connect more than two modems to
-          your Linux box, for instance in order to become a dial-in server.
-          For information about the Cyclades-Z card, read
-          <file:Documentation/serial/README.cycladesZ>.
-          To compile this driver as a module, choose M here: the
-          module will be called cyclades.
-          If you haven't heard about it, it's safe to say N.
-config CYZ_INTR
-        bool "Cyclades-Z interrupt mode operation (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && CYCLADES
-        help
-          The Cyclades-Z family of multiport cards allows 2 (two) driver op
-          modes: polling and interrupt. In polling mode, the driver will check
-          the status of the Cyclades-Z ports every certain amount of time
-          (which is called polling cycle and is configurable). In interrupt
-          mode, it will use an interrupt line (IRQ) in order to check the
-          status of the Cyclades-Z ports. The default op mode is polling. If
-          unsure, say N.
-config DIGIEPCA
-        tristate "Digiboard Intelligent Async Support"
-        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
-        ---help---
-          This is a driver for Digi International's Xx, Xeve, and Xem series
-          of cards which provide multiple serial ports. You would need
-          something like this to connect more than two modems to your Linux
-          box, for instance in order to become a dial-in server. This driver
-          supports the original PC (ISA) boards as well as PCI, and EISA. If
-          you have a card like this, say Y here and read the file
-          <file:Documentation/serial/digiepca.txt>.
-          To compile this driver as a module, choose M here: the
-          module will be called epca.
-config MOXA_INTELLIO
-        tristate "Moxa Intellio support"
-        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
-        select FW_LOADER
-        help
-          Say Y here if you have a Moxa Intellio multiport serial card.
-          To compile this driver as a module, choose M here: the
-          module will be called moxa.
-config MOXA_SMARTIO
-        tristate "Moxa SmartIO support v. 2.0"
-        depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
-        help
-          Say Y here if you have a Moxa SmartIO multiport serial card and/or
-          want to help develop a new version of this driver.
-          This is upgraded (1.9.1) driver from original Moxa drivers with
-          changes finally resulting in PCI probing.
-          This driver can also be built as a module. The module will be called
-          mxser. If you want to do that, say M here.
-config ISI
-        tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
-        depends on SERIAL_NONSTANDARD && PCI
-        select FW_LOADER
-        help
-          This is a driver for the Multi-Tech cards which provide several
-          serial ports.  The driver is experimental and can currently only be
-          built as a module. The module will be called isicom.
-          If you want to do that, choose M here.
-config SYNCLINK
-        tristate "Microgate SyncLink card support"
-        depends on SERIAL_NONSTANDARD && PCI && ISA_DMA_API
-        help
-          Provides support for the SyncLink ISA and PCI multiprotocol serial
-          adapters. These adapters support asynchronous and HDLC bit
-          synchronous communication up to 10Mbps (PCI adapter).
-          This driver can only be built as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want).
-          The module will be called synclink.  If you want to do that, say M
-          here.
-config SYNCLINKMP
-        tristate "SyncLink Multiport support"
-        depends on SERIAL_NONSTANDARD && PCI
-        help
-          Enable support for the SyncLink Multiport (2 or 4 ports)
-          serial adapter, running asynchronous and HDLC communications up
-          to 2.048Mbps. Each ports is independently selectable for
-          RS-232, V.35, RS-449, RS-530, and X.21
-          This driver may be built as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want).
-          The module will be called synclinkmp.  If you want to do that, say M
-          here.
-config SYNCLINK_GT
-        tristate "SyncLink GT/AC support"
-        depends on SERIAL_NONSTANDARD && PCI
-        help
-          Support for SyncLink GT and SyncLink AC families of
-          synchronous and asynchronous serial adapters
-          manufactured by Microgate Systems, Ltd. (www.microgate.com)
-config N_HDLC
-        tristate "HDLC line discipline support"
-        depends on SERIAL_NONSTANDARD
-        help
-          Allows synchronous HDLC communications with tty device drivers that
-          support synchronous HDLC such as the Microgate SyncLink adapter.
-          This driver can be built as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want).
-          The module will be called n_hdlc. If you want to do that, say M
-          here.
-config N_GSM
-        tristate "GSM MUX line discipline support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
-        depends on NET
-        help
-          This line discipline provides support for the GSM MUX protocol and
-          presents the mux as a set of 61 individual tty devices.
-config RISCOM8
-        tristate "SDL RISCom/8 card support"
-        depends on SERIAL_NONSTANDARD
-        help
-          This is a driver for the SDL Communications RISCom/8 multiport card,
-          which gives you many serial ports. You would need something like
-          this to connect more than two modems to your Linux box, for instance
-          in order to become a dial-in server. If you have a card like that,
-          say Y here and read the file <file:Documentation/serial/riscom8.txt>.
-          Also it's possible to say M here and compile this driver as kernel
-          loadable module; the module will be called riscom8.
-config SPECIALIX
-        tristate "Specialix IO8+ card support"
-        depends on SERIAL_NONSTANDARD
-        help
-          This is a driver for the Specialix IO8+ multiport card (both the
-          ISA and the PCI version) which gives you many serial ports. You
-          would need something like this to connect more than two modems to
-          your Linux box, for instance in order to become a dial-in server.
-          If you have a card like that, say Y here and read the file
-          <file:Documentation/serial/specialix.txt>. Also it's possible to say
-          M here and compile this driver as kernel loadable module which will be
-          called specialix.
-config SX
-        tristate "Specialix SX (and SI) card support"
-        depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN
-        help
-          This is a driver for the SX and SI multiport serial cards.
-          Please read the file <file:Documentation/serial/sx.txt> for details.
-          This driver can only be built as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want).
-          The module will be called sx. If you want to do that, say M here.
-config RIO
-        tristate "Specialix RIO system support"
-        depends on SERIAL_NONSTANDARD && BROKEN
-        help
-          This is a driver for the Specialix RIO, a smart serial card which
-          drives an outboard box that can support up to 128 ports.  Product
-          information is at <http://www.perle.com/support/documentation.html#multiport>.
-          There are both ISA and PCI versions.
-config RIO_OLDPCI
-        bool "Support really old RIO/PCI cards"
-        depends on RIO
-        help
-          Older RIO PCI cards need some initialization-time configuration to
-          determine the IRQ and some control addresses.  If you have a RIO and
-          this doesn't seem to work, try setting this to Y.
 config STALDRV
        bool "Stallion multiport serial support"
        depends on SERIAL_NONSTANDARD
@@ -356,54 +27,6 @@ config STALDRV
          in this case.  If you have never heard about all this, it's safe to
          say N.
-config STALLION
-        tristate "Stallion EasyIO or EC8/32 support"
-        depends on STALDRV && (ISA || EISA || PCI)
-        help
-          If you have an EasyIO or EasyConnection 8/32 multiport Stallion
-          card, then this is for you; say Y.  Make sure to read
-          <file:Documentation/serial/stallion.txt>.
-          To compile this driver as a module, choose M here: the
-          module will be called stallion.
-config ISTALLION
-        tristate "Stallion EC8/64, ONboard, Brumby support"
-        depends on STALDRV && (ISA || EISA || PCI)
-        help
-          If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
-          serial multiport card, say Y here. Make sure to read
-          <file:Documentation/serial/stallion.txt>.
-          To compile this driver as a module, choose M here: the
-          module will be called istallion.
-config NOZOMI
-        tristate "HSDPA Broadband Wireless Data Card - Globe Trotter"
-        depends on PCI && EXPERIMENTAL
-        help
-          If you have a HSDPA driver Broadband Wireless Data Card -
-          Globe Trotter PCMCIA card, say Y here.
-          To compile this driver as a module, choose M here, the module
-          will be called nozomi.
-config A2232
-        tristate "Commodore A2232 serial support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && ZORRO && BROKEN
-        ---help---
-          This option supports the 2232 7-port serial card shipped with the
-          Amiga 2000 and other Zorro-bus machines, dating from 1989.  At
-          a max of 19,200 bps, the ports are served by a 6551 ACIA UART chip
-          each, plus a 8520 CIA, and a master 6502 CPU and buffer as well. The
-          ports were connected with 8 pin DIN connectors on the card bracket,
-          for which 8 pin to DB25 adapters were supplied. The card also had
-          jumpers internally to toggle various pinning configurations.
-          This driver can be built as a module; but then "generic_serial"
-          will also be built as a module. This has to be loaded before
-          "ser_a2232". If you want to do this, answer M here.
 config SGI_SNSC
        bool "SGI Altix system controller communication support"
        depends on (IA64_SGI_SN2 || IA64_GENERIC)
@@ -428,71 +51,6 @@ config SGI_MBCS
 source "drivers/tty/serial/Kconfig"
-config UNIX98_PTYS
-        bool "Unix98 PTY support" if EXPERT
-        default y
-        ---help---
-          A pseudo terminal (PTY) is a software device consisting of two
-          halves: a master and a slave. The slave device behaves identical to
-          a physical terminal; the master device is used by a process to
-          read data from and write data to the slave, thereby emulating a
-          terminal. Typical programs for the master side are telnet servers
-          and xterms.
-          Linux has traditionally used the BSD-like names /dev/ptyxx for
-          masters and /dev/ttyxx for slaves of pseudo terminals. This scheme
-          has a number of problems. The GNU C library glibc 2.1 and later,
-          however, supports the Unix98 naming standard: in order to acquire a
-          pseudo terminal, a process opens /dev/ptmx; the number of the pseudo
-          terminal is then made available to the process and the pseudo
-          terminal slave can be accessed as /dev/pts/<number>. What was
-          traditionally /dev/ttyp2 will then be /dev/pts/2, for example.
-          All modern Linux systems use the Unix98 ptys.  Say Y unless
-          you're on an embedded system and want to conserve memory.
-config DEVPTS_MULTIPLE_INSTANCES
-        bool "Support multiple instances of devpts"
-        depends on UNIX98_PTYS
-        default n
-        ---help---
-          Enable support for multiple instances of devpts filesystem.
-          If you want to have isolated PTY namespaces (eg: in containers),
-          say Y here.  Otherwise, say N. If enabled, each mount of devpts
-          filesystem with the '-o newinstance' option will create an
-          independent PTY namespace.
-config LEGACY_PTYS
-        bool "Legacy (BSD) PTY support"
-        default y
-        ---help---
-          A pseudo terminal (PTY) is a software device consisting of two
-          halves: a master and a slave. The slave device behaves identical to
-          a physical terminal; the master device is used by a process to
-          read data from and write data to the slave, thereby emulating a
-          terminal. Typical programs for the master side are telnet servers
-          and xterms.
-          Linux has traditionally used the BSD-like names /dev/ptyxx
-          for masters and /dev/ttyxx for slaves of pseudo
-          terminals. This scheme has a number of problems, including
-          security.  This option enables these legacy devices; on most
-          systems, it is safe to say N.
-config LEGACY_PTY_COUNT
-        int "Maximum number of legacy PTY in use"
-        depends on LEGACY_PTYS
-        range 0 256
-        default "256"
-        ---help---
-          The maximum number of legacy PTYs that can be used at any one time.
-          The default is 256, and should be more than enough.  Embedded
-          systems may want to reduce this to save memory.
-          When not in use, each legacy PTY occupies 12 bytes on 32-bit
-          architectures and 24 bytes on 64-bit architectures.
 config TTY_PRINTK
        bool "TTY driver to output user messages via printk"
        depends on EXPERT
@@ -612,84 +170,7 @@ config PPDEV
          If unsure, say N.
-config HVC_DRIVER
+source "drivers/tty/hvc/Kconfig"
-        bool
-        help
-          Generic "hypervisor virtual console" infrastructure for various
-          hypervisors (pSeries, iSeries, Xen, lguest).
-          It will automatically be selected if one of the back-end console drivers
-          is selected.
-config HVC_IRQ
-        bool
-config HVC_CONSOLE
-        bool "pSeries Hypervisor Virtual Console support"
-        depends on PPC_PSERIES
-        select HVC_DRIVER
-        select HVC_IRQ
-        help
-          pSeries machines when partitioned support a hypervisor virtual
-          console. This driver allows each pSeries partition to have a console
-          which is accessed via the HMC.
-config HVC_ISERIES
-        bool "iSeries Hypervisor Virtual Console support"
-        depends on PPC_ISERIES
-        default y
-        select HVC_DRIVER
-        select HVC_IRQ
-        select VIOPATH
-        help
-          iSeries machines support a hypervisor virtual console.
-config HVC_RTAS
-        bool "IBM RTAS Console support"
-        depends on PPC_RTAS
-        select HVC_DRIVER
-        help
-          IBM Console device driver which makes use of RTAS
-config HVC_BEAT
-        bool "Toshiba's Beat Hypervisor Console support"
-        depends on PPC_CELLEB
-        select HVC_DRIVER
-        help
-          Toshiba's Cell Reference Set Beat Console device driver
-config HVC_IUCV
-        bool "z/VM IUCV Hypervisor console support (VM only)"
-        depends on S390
-        select HVC_DRIVER
-        select IUCV
-        default y
-        help
-          This driver provides a Hypervisor console (HVC) back-end to access
-          a Linux (console) terminal via a z/VM IUCV communication path.
-config HVC_XEN
-        bool "Xen Hypervisor Console support"
-        depends on XEN
-        select HVC_DRIVER
-        select HVC_IRQ
-        default y
-        help
-          Xen virtual console device driver
-config HVC_UDBG
-       bool "udbg based fake hypervisor console"
-       depends on PPC && EXPERIMENTAL
-       select HVC_DRIVER
-       default n
-config HVC_DCC
-       bool "ARM JTAG DCC console"
-       depends on ARM
-       select HVC_DRIVER
-       help
-         This console uses the JTAG DCC on ARM to create a console under the HVC
-         driver. This console is used through a JTAG only on ARM. If you don't have
-         a JTAG then you probably don't want this option.
 config VIRTIO_CONSOLE
        tristate "Virtio console"
@@ -707,23 +188,6 @@ config VIRTIO_CONSOLE
          the port which can be used by udev scripts to create a
          symlink to the device.
-config HVCS
-        tristate "IBM Hypervisor Virtual Console Server support"
-        depends on PPC_PSERIES && HVC_CONSOLE
-        help
-          Partitionable IBM Power5 ppc64 machines allow hosting of
-          firmware virtual consoles from one Linux partition by
-          another Linux partition.  This driver allows console data
-          from Linux partitions to be accessed through TTY device
-          interfaces in the device tree of a Linux partition running
-          this driver.
-          To compile this driver as a module, choose M here: the
-          module will be called hvcs.  Additionally, this module
-          will depend on arch specific APIs exported from hvcserver.ko
-          which will also be compiled when this driver is built as a
-          module.
 config IBM_BSR
        tristate "IBM POWER Barrier Synchronization Register support"
        depends on PPC_PSERIES
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 8238f89f73c9..057f65452e7b 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -5,31 +5,7 @@
 obj-y                           += mem.o random.o
 obj-$(CONFIG_TTY_PRINTK)        += ttyprintk.o
 obj-y                           += misc.o
-obj-$(CONFIG_BFIN_JTAG_COMM)    += bfin_jtag_comm.o
-obj-$(CONFIG_MVME147_SCC)       += generic_serial.o vme_scc.o
-obj-$(CONFIG_MVME162_SCC)       += generic_serial.o vme_scc.o
-obj-$(CONFIG_BVME6000_SCC)      += generic_serial.o vme_scc.o
-obj-$(CONFIG_ROCKETPORT)        += rocket.o
-obj-$(CONFIG_SERIAL167)         += serial167.o
-obj-$(CONFIG_CYCLADES)          += cyclades.o
-obj-$(CONFIG_STALLION)          += stallion.o
-obj-$(CONFIG_ISTALLION)         += istallion.o
-obj-$(CONFIG_NOZOMI)            += nozomi.o
-obj-$(CONFIG_DIGIEPCA)          += epca.o
-obj-$(CONFIG_SPECIALIX)         += specialix.o
-obj-$(CONFIG_MOXA_INTELLIO)     += moxa.o
-obj-$(CONFIG_A2232)             += ser_a2232.o generic_serial.o
 obj-$(CONFIG_ATARI_DSP56K)      += dsp56k.o
-obj-$(CONFIG_MOXA_SMARTIO)      += mxser.o
-obj-$(CONFIG_COMPUTONE)         += ip2/
-obj-$(CONFIG_RISCOM8)           += riscom8.o
-obj-$(CONFIG_ISI)               += isicom.o
-obj-$(CONFIG_SYNCLINK)          += synclink.o
-obj-$(CONFIG_SYNCLINKMP)        += synclinkmp.o
-obj-$(CONFIG_SYNCLINK_GT)       += synclink_gt.o
-obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
-obj-$(CONFIG_SX)                += sx.o generic_serial.o
-obj-$(CONFIG_RIO)               += rio/ generic_serial.o
 obj-$(CONFIG_VIRTIO_CONSOLE)    += virtio_console.o
 obj-$(CONFIG_RAW_DRIVER)        += raw.o
 obj-$(CONFIG_SGI_SNSC)          += snsc.o snsc_event.o
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index eaa41992fbe2..02127cad0980 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -418,9 +418,9 @@ static void bh_status(MGSLPC_INFO *info);
 /*
 * ioctl handlers
 */
-static int tiocmget(struct tty_struct *tty, struct file *file);
+static int tiocmget(struct tty_struct *tty);
-static int tiocmset(struct tty_struct *tty, struct file *file,
+static int tiocmset(struct tty_struct *tty,
-                    unsigned int set, unsigned int clear);
+                                        unsigned int set, unsigned int clear);
 static int get_stats(MGSLPC_INFO *info, struct mgsl_icount __user *user_icount);
 static int get_params(MGSLPC_INFO *info, MGSL_PARAMS __user *user_params);
 static int set_params(MGSLPC_INFO *info, MGSL_PARAMS __user *new_params, struct tty_struct *tty);
@@ -2114,7 +2114,7 @@ static int modem_input_wait(MGSLPC_INFO *info,int arg)
 /* return the state of the serial control and status signals
 */
-static int tiocmget(struct tty_struct *tty, struct file *file)
+static int tiocmget(struct tty_struct *tty)
 {
        MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data;
        unsigned int result;
@@ -2139,7 +2139,7 @@ static int tiocmget(struct tty_struct *tty, struct file *file)
 /* set modem control signals (DTR/RTS)
 */
-static int tiocmset(struct tty_struct *tty, struct file *file,
+static int tiocmset(struct tty_struct *tty,
                    unsigned int set, unsigned int clear)
 {
        MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data;
diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c
index c40c1612c8a7..a1f68af4ccf4 100644
--- a/drivers/char/ttyprintk.c
+++ b/drivers/char/ttyprintk.c
@@ -144,7 +144,7 @@ static int tpk_write_room(struct tty_struct *tty)
 /*
 * TTY operations ioctl function.
 */
-static int tpk_ioctl(struct tty_struct *tty, struct file *file,
+static int tpk_ioctl(struct tty_struct *tty,
                        unsigned int cmd, unsigned long arg)
 {
        struct ttyprintk_port *tpkp = tty->driver_data;
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index f80a7c48a35f..0d7088367038 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1219,16 +1219,10 @@ static int capinc_tty_chars_in_buffer(struct tty_struct *tty)
        return mp->outbytes;
 }
-static int capinc_tty_ioctl(struct tty_struct *tty, struct file * file,
+static int capinc_tty_ioctl(struct tty_struct *tty,
                    unsigned int cmd, unsigned long arg)
 {
-        int error = 0;
+        return -ENOIOCTLCMD;
-        switch (cmd) {
-        default:
-                error = n_tty_ioctl_helper(tty, file, cmd, arg);
-                break;
-        }
-        return error;
 }
 static void capinc_tty_set_termios(struct tty_struct *tty, struct ktermios * old)
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index bb710d16a526..59de638225fe 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -115,15 +115,15 @@ static int if_config(struct cardstate *cs, int *arg)
 static int  if_open(struct tty_struct *tty, struct file *filp);
 static void if_close(struct tty_struct *tty, struct file *filp);
-static int  if_ioctl(struct tty_struct *tty, struct file *file,
+static int  if_ioctl(struct tty_struct *tty,
                     unsigned int cmd, unsigned long arg);
 static int  if_write_room(struct tty_struct *tty);
 static int  if_chars_in_buffer(struct tty_struct *tty);
 static void if_throttle(struct tty_struct *tty);
 static void if_unthrottle(struct tty_struct *tty);
 static void if_set_termios(struct tty_struct *tty, struct ktermios *old);
-static int  if_tiocmget(struct tty_struct *tty, struct file *file);
+static int  if_tiocmget(struct tty_struct *tty);
-static int  if_tiocmset(struct tty_struct *tty, struct file *file,
+static int  if_tiocmset(struct tty_struct *tty,
                        unsigned int set, unsigned int clear);
 static int  if_write(struct tty_struct *tty,
                     const unsigned char *buf, int count);
@@ -205,7 +205,7 @@ static void if_close(struct tty_struct *tty, struct file *filp)
        module_put(cs->driver->owner);
 }
-static int if_ioctl(struct tty_struct *tty, struct file *file,
+static int if_ioctl(struct tty_struct *tty,
                    unsigned int cmd, unsigned long arg)
 {
        struct cardstate *cs;
@@ -280,7 +280,7 @@ static int if_ioctl(struct tty_struct *tty, struct file *file,
        return retval;
 }
-static int if_tiocmget(struct tty_struct *tty, struct file *file)
+static int if_tiocmget(struct tty_struct *tty)
 {
        struct cardstate *cs;
        int retval;
@@ -303,7 +303,7 @@ static int if_tiocmget(struct tty_struct *tty, struct file *file)
        return retval;
 }
-static int if_tiocmset(struct tty_struct *tty, struct file *file,
+static int if_tiocmset(struct tty_struct *tty,
                       unsigned int set, unsigned int clear)
 {
        struct cardstate *cs;
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index 0ef09d0eb96b..86a5c4f7775e 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -440,7 +440,7 @@ static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
        if (!set && !clear)
                return 0;
        gig_dbg(DEBUG_IF, "tiocmset set %x clear %x", set, clear);
-        return tty->ops->tiocmset(tty, NULL, set, clear);
+        return tty->ops->tiocmset(tty, set, clear);
 }
 static int gigaset_baud_rate(struct cardstate *cs, unsigned cflag)
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index c463162843ba..3d88f15aa218 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1345,7 +1345,7 @@ isdn_tty_get_lsr_info(modem_info * info, uint __user * value)
 static int
-isdn_tty_tiocmget(struct tty_struct *tty, struct file *file)
+isdn_tty_tiocmget(struct tty_struct *tty)
 {
        modem_info *info = (modem_info *) tty->driver_data;
        u_char control, status;
@@ -1372,7 +1372,7 @@ isdn_tty_tiocmget(struct tty_struct *tty, struct file *file)
 }
 static int
-isdn_tty_tiocmset(struct tty_struct *tty, struct file *file,
+isdn_tty_tiocmset(struct tty_struct *tty,
                unsigned int set, unsigned int clear)
 {
        modem_info *info = (modem_info *) tty->driver_data;
@@ -1413,8 +1413,7 @@ isdn_tty_tiocmset(struct tty_struct *tty, struct file *file,
 }
 static int
-isdn_tty_ioctl(struct tty_struct *tty, struct file *file,
+isdn_tty_ioctl(struct tty_struct *tty, uint cmd, ulong arg)
-               uint cmd, ulong arg)
 {
        modem_info *info = (modem_info *) tty->driver_data;
        int retval;
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c
index a0716967b7c8..c8c9edb3d7cb 100644
--- a/drivers/mmc/card/sdio_uart.c
+++ b/drivers/mmc/card/sdio_uart.c
@@ -956,7 +956,7 @@ static int sdio_uart_break_ctl(struct tty_struct *tty, int break_state)
        return 0;
 }
-static int sdio_uart_tiocmget(struct tty_struct *tty, struct file *file)
+static int sdio_uart_tiocmget(struct tty_struct *tty)
 {
        struct sdio_uart_port *port = tty->driver_data;
        int result;
@@ -970,7 +970,7 @@ static int sdio_uart_tiocmget(struct tty_struct *tty, struct file *file)
        return result;
 }
-static int sdio_uart_tiocmset(struct tty_struct *tty, struct file *file,
+static int sdio_uart_tiocmset(struct tty_struct *tty,
                              unsigned int set, unsigned int clear)
 {
        struct sdio_uart_port *port = tty->driver_data;
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c
index ee1dde52e8fc..3352b2443e58 100644
--- a/drivers/net/irda/irtty-sir.c
+++ b/drivers/net/irda/irtty-sir.c
@@ -167,7 +167,7 @@ static int irtty_set_dtr_rts(struct sir_dev *dev, int dtr, int rts)
         * let's be careful... Jean II
         */
        IRDA_ASSERT(priv->tty->ops->tiocmset != NULL, return -1;);
-        priv->tty->ops->tiocmset(priv->tty, NULL, set, clear);
+        priv->tty->ops->tiocmset(priv->tty, set, clear);
        return 0;
 }
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 6d83812603b6..387ca43f26f4 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -324,7 +324,7 @@ struct hso_device {
 /* Prototypes                                                                */
 /*****************************************************************************/
 /* Serial driver functions */
-static int hso_serial_tiocmset(struct tty_struct *tty, struct file *file,
+static int hso_serial_tiocmset(struct tty_struct *tty,
                               unsigned int set, unsigned int clear);
 static void ctrl_callback(struct urb *urb);
 static int put_rxbuf_data(struct urb *urb, struct hso_serial *serial);
@@ -1335,7 +1335,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
        /* done */
        if (result)
-                hso_serial_tiocmset(tty, NULL, TIOCM_RTS | TIOCM_DTR, 0);
+                hso_serial_tiocmset(tty, TIOCM_RTS | TIOCM_DTR, 0);
 err_out:
        mutex_unlock(&serial->parent->mutex);
        return result;
@@ -1656,7 +1656,7 @@ static int hso_get_count(struct tty_struct *tty,
 }
-static int hso_serial_tiocmget(struct tty_struct *tty, struct file *file)
+static int hso_serial_tiocmget(struct tty_struct *tty)
 {
        int retval;
        struct hso_serial *serial = get_serial_by_tty(tty);
@@ -1687,7 +1687,7 @@ static int hso_serial_tiocmget(struct tty_struct *tty, struct file *file)
        return retval;
 }
-static int hso_serial_tiocmset(struct tty_struct *tty, struct file *file,
+static int hso_serial_tiocmset(struct tty_struct *tty,
                               unsigned int set, unsigned int clear)
 {
        int val = 0;
@@ -1730,7 +1730,7 @@ static int hso_serial_tiocmset(struct tty_struct *tty, struct file *file,
                               USB_CTRL_SET_TIMEOUT);
 }
-static int hso_serial_ioctl(struct tty_struct *tty, struct file *file,
+static int hso_serial_ioctl(struct tty_struct *tty,
                            unsigned int cmd, unsigned long arg)
 {
        struct hso_serial *serial =  get_serial_by_tty(tty);
diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c
index 515d9b8af01e..1c65d1c33873 100644
--- a/drivers/net/wan/pc300_tty.c
+++ b/drivers/net/wan/pc300_tty.c
@@ -131,9 +131,8 @@ static void cpc_tty_trace(pc300dev_t *dev, char* buf, int len, char rxtx);
 static void cpc_tty_signal_off(pc300dev_t *pc300dev, unsigned char);
 static void cpc_tty_signal_on(pc300dev_t *pc300dev, unsigned char);
-static int pc300_tiocmset(struct tty_struct *, struct file *,
+static int pc300_tiocmset(struct tty_struct *, unsigned int, unsigned int);
-                          unsigned int, unsigned int);
+static int pc300_tiocmget(struct tty_struct *);
-static int pc300_tiocmget(struct tty_struct *, struct file *);
 /* functions called by PC300 driver */
 void cpc_tty_init(pc300dev_t *dev);
@@ -543,7 +542,7 @@ static int cpc_tty_chars_in_buffer(struct tty_struct *tty)
        return 0;
 } 
-static int pc300_tiocmset(struct tty_struct *tty, struct file *file,
+static int pc300_tiocmset(struct tty_struct *tty,
                          unsigned int set, unsigned int clear)
 {
        st_cpc_tty_area    *cpc_tty; 
@@ -570,7 +569,7 @@ static int pc300_tiocmset(struct tty_struct *tty, struct file *file,
        return 0;
 }
-static int pc300_tiocmget(struct tty_struct *tty, struct file *file)
+static int pc300_tiocmget(struct tty_struct *tty)
 {
        unsigned int result;
        unsigned char status;
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 5c8fcfc42c3e..58e4a8e15a0e 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -41,6 +41,10 @@ config STAGING_EXCLUDE_BUILD
 if !STAGING_EXCLUDE_BUILD
+source "drivers/staging/tty/Kconfig"
+source "drivers/staging/generic_serial/Kconfig"
 source "drivers/staging/et131x/Kconfig"
 source "drivers/staging/slicoss/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index d53886317826..ff7372d25c91 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -3,6 +3,8 @@
 # fix for build system bug...
 obj-$(CONFIG_STAGING)           += staging.o
+obj-y += tty/
+obj-y += generic_serial/
 obj-$(CONFIG_ET131X)            += et131x/
 obj-$(CONFIG_SLICOSS)           += slicoss/
 obj-$(CONFIG_VIDEO_GO7007)      += go7007/
diff --git a/drivers/staging/generic_serial/Kconfig b/drivers/staging/generic_serial/Kconfig
new file mode 100644
index 000000000000..795daea37750
--- /dev/null
+++ b/drivers/staging/generic_serial/Kconfig
@@ -0,0 +1,45 @@
+config A2232
+        tristate "Commodore A2232 serial support (EXPERIMENTAL)"
+        depends on EXPERIMENTAL && ZORRO && BROKEN
+        ---help---
+          This option supports the 2232 7-port serial card shipped with the
+          Amiga 2000 and other Zorro-bus machines, dating from 1989.  At
+          a max of 19,200 bps, the ports are served by a 6551 ACIA UART chip
+          each, plus a 8520 CIA, and a master 6502 CPU and buffer as well. The
+          ports were connected with 8 pin DIN connectors on the card bracket,
+          for which 8 pin to DB25 adapters were supplied. The card also had
+          jumpers internally to toggle various pinning configurations.
+          This driver can be built as a module; but then "generic_serial"
+          will also be built as a module. This has to be loaded before
+          "ser_a2232". If you want to do this, answer M here.
+config SX
+        tristate "Specialix SX (and SI) card support"
+        depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN
+        help
+          This is a driver for the SX and SI multiport serial cards.
+          Please read the file <file:Documentation/serial/sx.txt> for details.
+          This driver can only be built as a module ( = code which can be
+          inserted in and removed from the running kernel whenever you want).
+          The module will be called sx. If you want to do that, say M here.
+config RIO
+        tristate "Specialix RIO system support"
+        depends on SERIAL_NONSTANDARD && BROKEN
+        help
+          This is a driver for the Specialix RIO, a smart serial card which
+          drives an outboard box that can support up to 128 ports.  Product
+          information is at <http://www.perle.com/support/documentation.html#multiport>.
+          There are both ISA and PCI versions.
+config RIO_OLDPCI
+        bool "Support really old RIO/PCI cards"
+        depends on RIO
+        help
+          Older RIO PCI cards need some initialization-time configuration to
+          determine the IRQ and some control addresses.  If you have a RIO and
+          this doesn't seem to work, try setting this to Y.
diff --git a/drivers/staging/generic_serial/Makefile b/drivers/staging/generic_serial/Makefile
new file mode 100644
index 000000000000..ffc90c8b013c
--- /dev/null
+++ b/drivers/staging/generic_serial/Makefile
@@ -0,0 +1,6 @@
+obj-$(CONFIG_MVME147_SCC)       += generic_serial.o vme_scc.o
+obj-$(CONFIG_MVME162_SCC)       += generic_serial.o vme_scc.o
+obj-$(CONFIG_BVME6000_SCC)      += generic_serial.o vme_scc.o
+obj-$(CONFIG_A2232)             += ser_a2232.o generic_serial.o
+obj-$(CONFIG_SX)                += sx.o generic_serial.o
+obj-$(CONFIG_RIO)               += rio/ generic_serial.o
diff --git a/drivers/staging/generic_serial/TODO b/drivers/staging/generic_serial/TODO
new file mode 100644
index 000000000000..88756453ac6c
--- /dev/null
+++ b/drivers/staging/generic_serial/TODO
@@ -0,0 +1,6 @@
+These are a few tty/serial drivers that either do not build,
+or work if they do build, or if they seem to work, are for obsolete
+hardware, or are full of unfixable races and no one uses them anymore.
+If no one steps up to adopt any of these drivers, they will be removed
+in the 2.6.41 release.
diff --git a/drivers/char/generic_serial.c b/drivers/staging/generic_serial/generic_serial.c
index 5954ee1dc953..5954ee1dc953 100644
--- a/drivers/char/generic_serial.c
+++ b/drivers/staging/generic_serial/generic_serial.c
diff --git a/drivers/char/rio/Makefile b/drivers/staging/generic_serial/rio/Makefile
index 1661875883fb..1661875883fb 100644
--- a/drivers/char/rio/Makefile
+++ b/drivers/staging/generic_serial/rio/Makefile
diff --git a/drivers/char/rio/board.h b/drivers/staging/generic_serial/rio/board.h
index bdea633a9076..bdea633a9076 100644
--- a/drivers/char/rio/board.h
+++ b/drivers/staging/generic_serial/rio/board.h
diff --git a/drivers/char/rio/cirrus.h b/drivers/staging/generic_serial/rio/cirrus.h
index 5ab51679caa2..5ab51679caa2 100644
--- a/drivers/char/rio/cirrus.h
+++ b/drivers/staging/generic_serial/rio/cirrus.h
diff --git a/drivers/char/rio/cmdblk.h b/drivers/staging/generic_serial/rio/cmdblk.h
index 9ed4f861675a..9ed4f861675a 100644
--- a/drivers/char/rio/cmdblk.h
+++ b/drivers/staging/generic_serial/rio/cmdblk.h
diff --git a/drivers/char/rio/cmdpkt.h b/drivers/staging/generic_serial/rio/cmdpkt.h
index c1e7a2798070..c1e7a2798070 100644
--- a/drivers/char/rio/cmdpkt.h
+++ b/drivers/staging/generic_serial/rio/cmdpkt.h
diff --git a/drivers/char/rio/daemon.h b/drivers/staging/generic_serial/rio/daemon.h
index 4af90323fd00..4af90323fd00 100644
--- a/drivers/char/rio/daemon.h
+++ b/drivers/staging/generic_serial/rio/daemon.h
diff --git a/drivers/char/rio/errors.h b/drivers/staging/generic_serial/rio/errors.h
index bdb05234090a..bdb05234090a 100644
--- a/drivers/char/rio/errors.h
+++ b/drivers/staging/generic_serial/rio/errors.h
diff --git a/drivers/char/rio/func.h b/drivers/staging/generic_serial/rio/func.h
index 078d44f85e45..078d44f85e45 100644
--- a/drivers/char/rio/func.h
+++ b/drivers/staging/generic_serial/rio/func.h
diff --git a/drivers/char/rio/host.h b/drivers/staging/generic_serial/rio/host.h
index 78f24540c224..78f24540c224 100644
--- a/drivers/char/rio/host.h
+++ b/drivers/staging/generic_serial/rio/host.h
diff --git a/drivers/char/rio/link.h b/drivers/staging/generic_serial/rio/link.h
index f3bf11a04d41..f3bf11a04d41 100644
--- a/drivers/char/rio/link.h
+++ b/drivers/staging/generic_serial/rio/link.h
diff --git a/drivers/char/rio/linux_compat.h b/drivers/staging/generic_serial/rio/linux_compat.h
index 34c0d2899ef1..34c0d2899ef1 100644
--- a/drivers/char/rio/linux_compat.h
+++ b/drivers/staging/generic_serial/rio/linux_compat.h
diff --git a/drivers/char/rio/map.h b/drivers/staging/generic_serial/rio/map.h
index 8366978578c1..8366978578c1 100644
--- a/drivers/char/rio/map.h
+++ b/drivers/staging/generic_serial/rio/map.h
diff --git a/drivers/char/rio/param.h b/drivers/staging/generic_serial/rio/param.h
index 7e9b6283e8aa..7e9b6283e8aa 100644
--- a/drivers/char/rio/param.h
+++ b/drivers/staging/generic_serial/rio/param.h
diff --git a/drivers/char/rio/parmmap.h b/drivers/staging/generic_serial/rio/parmmap.h
index acc8fa439df5..acc8fa439df5 100644
--- a/drivers/char/rio/parmmap.h
+++ b/drivers/staging/generic_serial/rio/parmmap.h
diff --git a/drivers/char/rio/pci.h b/drivers/staging/generic_serial/rio/pci.h
index 6032f9135956..6032f9135956 100644
--- a/drivers/char/rio/pci.h
+++ b/drivers/staging/generic_serial/rio/pci.h
diff --git a/drivers/char/rio/phb.h b/drivers/staging/generic_serial/rio/phb.h
index a4c48ae4e365..a4c48ae4e365 100644
--- a/drivers/char/rio/phb.h
+++ b/drivers/staging/generic_serial/rio/phb.h
diff --git a/drivers/char/rio/pkt.h b/drivers/staging/generic_serial/rio/pkt.h
index a9458164f02f..a9458164f02f 100644
--- a/drivers/char/rio/pkt.h
+++ b/drivers/staging/generic_serial/rio/pkt.h
diff --git a/drivers/char/rio/port.h b/drivers/staging/generic_serial/rio/port.h
index 49cf6d15ee54..49cf6d15ee54 100644
--- a/drivers/char/rio/port.h
+++ b/drivers/staging/generic_serial/rio/port.h
diff --git a/drivers/char/rio/protsts.h b/drivers/staging/generic_serial/rio/protsts.h
index 8ab79401d3ee..8ab79401d3ee 100644
--- a/drivers/char/rio/protsts.h
+++ b/drivers/staging/generic_serial/rio/protsts.h
diff --git a/drivers/char/rio/rio.h b/drivers/staging/generic_serial/rio/rio.h
index 1bf36223a4e8..1bf36223a4e8 100644
--- a/drivers/char/rio/rio.h
+++ b/drivers/staging/generic_serial/rio/rio.h
diff --git a/drivers/char/rio/rio_linux.c b/drivers/staging/generic_serial/rio/rio_linux.c
index 5e33293d24e3..5e33293d24e3 100644
--- a/drivers/char/rio/rio_linux.c
+++ b/drivers/staging/generic_serial/rio/rio_linux.c
diff --git a/drivers/char/rio/rio_linux.h b/drivers/staging/generic_serial/rio/rio_linux.h
index 7f26cd7c815e..7f26cd7c815e 100644
--- a/drivers/char/rio/rio_linux.h
+++ b/drivers/staging/generic_serial/rio/rio_linux.h
diff --git a/drivers/char/rio/rioboard.h b/drivers/staging/generic_serial/rio/rioboard.h
index 252230043c82..252230043c82 100644
--- a/drivers/char/rio/rioboard.h
+++ b/drivers/staging/generic_serial/rio/rioboard.h
diff --git a/drivers/char/rio/rioboot.c b/drivers/staging/generic_serial/rio/rioboot.c
index d956dd316005..d956dd316005 100644
--- a/drivers/char/rio/rioboot.c
+++ b/drivers/staging/generic_serial/rio/rioboot.c
diff --git a/drivers/char/rio/riocmd.c b/drivers/staging/generic_serial/rio/riocmd.c
index f121357e5af0..f121357e5af0 100644
--- a/drivers/char/rio/riocmd.c
+++ b/drivers/staging/generic_serial/rio/riocmd.c
diff --git a/drivers/char/rio/rioctrl.c b/drivers/staging/generic_serial/rio/rioctrl.c
index 780506326a73..780506326a73 100644
--- a/drivers/char/rio/rioctrl.c
+++ b/drivers/staging/generic_serial/rio/rioctrl.c
diff --git a/drivers/char/rio/riodrvr.h b/drivers/staging/generic_serial/rio/riodrvr.h
index 0907e711b355..0907e711b355 100644
--- a/drivers/char/rio/riodrvr.h
+++ b/drivers/staging/generic_serial/rio/riodrvr.h
diff --git a/drivers/char/rio/rioinfo.h b/drivers/staging/generic_serial/rio/rioinfo.h
index 42ff1e79d96f..42ff1e79d96f 100644
--- a/drivers/char/rio/rioinfo.h
+++ b/drivers/staging/generic_serial/rio/rioinfo.h
diff --git a/drivers/char/rio/rioinit.c b/drivers/staging/generic_serial/rio/rioinit.c
index 24a282bb89d4..24a282bb89d4 100644
--- a/drivers/char/rio/rioinit.c
+++ b/drivers/staging/generic_serial/rio/rioinit.c
diff --git a/drivers/char/rio/riointr.c b/drivers/staging/generic_serial/rio/riointr.c
index 2e71aecae206..2e71aecae206 100644
--- a/drivers/char/rio/riointr.c
+++ b/drivers/staging/generic_serial/rio/riointr.c
diff --git a/drivers/char/rio/rioioctl.h b/drivers/staging/generic_serial/rio/rioioctl.h
index e8af5b30519e..e8af5b30519e 100644
--- a/drivers/char/rio/rioioctl.h
+++ b/drivers/staging/generic_serial/rio/rioioctl.h
diff --git a/drivers/char/rio/rioparam.c b/drivers/staging/generic_serial/rio/rioparam.c
index 6415f3f32a72..6415f3f32a72 100644
--- a/drivers/char/rio/rioparam.c
+++ b/drivers/staging/generic_serial/rio/rioparam.c
diff --git a/drivers/char/rio/rioroute.c b/drivers/staging/generic_serial/rio/rioroute.c
index f9b936ac3394..f9b936ac3394 100644
--- a/drivers/char/rio/rioroute.c
+++ b/drivers/staging/generic_serial/rio/rioroute.c
diff --git a/drivers/char/rio/riospace.h b/drivers/staging/generic_serial/rio/riospace.h
index ffb31d4332b9..ffb31d4332b9 100644
--- a/drivers/char/rio/riospace.h
+++ b/drivers/staging/generic_serial/rio/riospace.h
diff --git a/drivers/char/rio/riotable.c b/drivers/staging/generic_serial/rio/riotable.c
index 3d15802dc0f3..3d15802dc0f3 100644
--- a/drivers/char/rio/riotable.c
+++ b/drivers/staging/generic_serial/rio/riotable.c
diff --git a/drivers/char/rio/riotty.c b/drivers/staging/generic_serial/rio/riotty.c
index 8a90393faf3c..8a90393faf3c 100644
--- a/drivers/char/rio/riotty.c
+++ b/drivers/staging/generic_serial/rio/riotty.c
diff --git a/drivers/char/rio/route.h b/drivers/staging/generic_serial/rio/route.h
index 46e963771c30..46e963771c30 100644
--- a/drivers/char/rio/route.h
+++ b/drivers/staging/generic_serial/rio/route.h
diff --git a/drivers/char/rio/rup.h b/drivers/staging/generic_serial/rio/rup.h
index 4ae90cb207a9..4ae90cb207a9 100644
--- a/drivers/char/rio/rup.h
+++ b/drivers/staging/generic_serial/rio/rup.h
diff --git a/drivers/char/rio/unixrup.h b/drivers/staging/generic_serial/rio/unixrup.h
index 7abf0cba0f2c..7abf0cba0f2c 100644
--- a/drivers/char/rio/unixrup.h
+++ b/drivers/staging/generic_serial/rio/unixrup.h
diff --git a/drivers/char/ser_a2232.c b/drivers/staging/generic_serial/ser_a2232.c
index 9610861d1f5f..3f47c2ead8e5 100644
--- a/drivers/char/ser_a2232.c
+++ b/drivers/staging/generic_serial/ser_a2232.c
@@ -133,8 +133,8 @@ static void a2232_hungup(void *ptr);
 /* END GENERIC_SERIAL PROTOTYPES */
 /* Functions that the TTY driver struct expects */
-static int  a2232_ioctl(struct tty_struct *tty, struct file *file,
+static int  a2232_ioctl(struct tty_struct *tty,
-                                                                                unsigned int cmd, unsigned long arg);
+                                unsigned int cmd, unsigned long arg);
 static void a2232_throttle(struct tty_struct *tty);
 static void a2232_unthrottle(struct tty_struct *tty);
 static int  a2232_open(struct tty_struct * tty, struct file * filp);
@@ -447,7 +447,7 @@ static void a2232_hungup(void *ptr)
 /*** END   OF REAL_DRIVER FUNCTIONS ***/
 /*** BEGIN  FUNCTIONS EXPECTED BY TTY DRIVER STRUCTS ***/
-static int a2232_ioctl( struct tty_struct *tty, struct file *file,
+static int a2232_ioctl( struct tty_struct *tty,
                        unsigned int cmd, unsigned long arg)
 {
        return -ENOIOCTLCMD;
diff --git a/drivers/char/ser_a2232.h b/drivers/staging/generic_serial/ser_a2232.h
index bc09eb9e118b..bc09eb9e118b 100644
--- a/drivers/char/ser_a2232.h
+++ b/drivers/staging/generic_serial/ser_a2232.h
diff --git a/drivers/char/ser_a2232fw.ax b/drivers/staging/generic_serial/ser_a2232fw.ax
index 736438032768..736438032768 100644
--- a/drivers/char/ser_a2232fw.ax
+++ b/drivers/staging/generic_serial/ser_a2232fw.ax
diff --git a/drivers/char/ser_a2232fw.h b/drivers/staging/generic_serial/ser_a2232fw.h
index e09a30acfe5c..e09a30acfe5c 100644
--- a/drivers/char/ser_a2232fw.h
+++ b/drivers/staging/generic_serial/ser_a2232fw.h
diff --git a/drivers/char/sx.c b/drivers/staging/generic_serial/sx.c
index a786326cea2f..1291462bcddb 100644
--- a/drivers/char/sx.c
+++ b/drivers/staging/generic_serial/sx.c
@@ -1873,14 +1873,14 @@ static int sx_break(struct tty_struct *tty, int flag)
        return 0;
 }
-static int sx_tiocmget(struct tty_struct *tty, struct file *file)
+static int sx_tiocmget(struct tty_struct *tty)
 {
        struct sx_port *port = tty->driver_data;
        return sx_getsignals(port);
 }
-static int sx_tiocmset(struct tty_struct *tty, struct file *file,
+static int sx_tiocmset(struct tty_struct *tty,
-                unsigned int set, unsigned int clear)
+                                        unsigned int set, unsigned int clear)
 {
        struct sx_port *port = tty->driver_data;
        int rts = -1, dtr = -1;
@@ -1899,7 +1899,7 @@ static int sx_tiocmset(struct tty_struct *tty, struct file *file,
        return 0;
 }
-static int sx_ioctl(struct tty_struct *tty, struct file *filp,
+static int sx_ioctl(struct tty_struct *tty,
                unsigned int cmd, unsigned long arg)
 {
        int rc;
diff --git a/drivers/char/sx.h b/drivers/staging/generic_serial/sx.h
index 87c2defdead7..87c2defdead7 100644
--- a/drivers/char/sx.h
+++ b/drivers/staging/generic_serial/sx.h
diff --git a/drivers/char/sxboards.h b/drivers/staging/generic_serial/sxboards.h
index 427927dc7dbf..427927dc7dbf 100644
--- a/drivers/char/sxboards.h
+++ b/drivers/staging/generic_serial/sxboards.h
diff --git a/drivers/char/sxwindow.h b/drivers/staging/generic_serial/sxwindow.h
index cf01b662aefc..cf01b662aefc 100644
--- a/drivers/char/sxwindow.h
+++ b/drivers/staging/generic_serial/sxwindow.h
diff --git a/drivers/char/vme_scc.c b/drivers/staging/generic_serial/vme_scc.c
index 12de1202d22c..96838640f575 100644
--- a/drivers/char/vme_scc.c
+++ b/drivers/staging/generic_serial/vme_scc.c
@@ -75,7 +75,7 @@ static void scc_hungup(void  *ptr);
 static void scc_close(void  *ptr);
 static int scc_chars_in_buffer(void * ptr);
 static int scc_open(struct tty_struct * tty, struct file * filp);
-static int scc_ioctl(struct tty_struct * tty, struct file * filp,
+static int scc_ioctl(struct tty_struct * tty,
                     unsigned int cmd, unsigned long arg);
 static void scc_throttle(struct tty_struct *tty);
 static void scc_unthrottle(struct tty_struct *tty);
@@ -1046,7 +1046,7 @@ static void scc_unthrottle (struct tty_struct * tty)
 }
-static int scc_ioctl(struct tty_struct *tty, struct file *file,
+static int scc_ioctl(struct tty_struct *tty,
                     unsigned int cmd, unsigned long arg)
 {
        return -ENOIOCTLCMD;
diff --git a/drivers/staging/quatech_usb2/quatech_usb2.c b/drivers/staging/quatech_usb2/quatech_usb2.c
index ed58f482c963..36b18e302718 100644
--- a/drivers/staging/quatech_usb2/quatech_usb2.c
+++ b/drivers/staging/quatech_usb2/quatech_usb2.c
@@ -852,7 +852,7 @@ static int qt2_chars_in_buffer(struct tty_struct *tty)
 * TIOCMGET and TIOCMSET are filtered off to their own methods before they get
 * here, so we don't have to handle them.
 */
-static int qt2_ioctl(struct tty_struct *tty, struct file *file,
+static int qt2_ioctl(struct tty_struct *tty,
                     unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -1078,7 +1078,7 @@ static void qt2_set_termios(struct tty_struct *tty,
        }
 }
-static int qt2_tiocmget(struct tty_struct *tty, struct file *file)
+static int qt2_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct usb_serial *serial = port->serial;
@@ -1121,7 +1121,7 @@ static int qt2_tiocmget(struct tty_struct *tty, struct file *file)
        }
 }
-static int qt2_tiocmset(struct tty_struct *tty, struct file *file,
+static int qt2_tiocmset(struct tty_struct *tty,
                       unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c
index 27841ef6a568..e0aae86a8809 100644
--- a/drivers/staging/serqt_usb2/serqt_usb2.c
+++ b/drivers/staging/serqt_usb2/serqt_usb2.c
@@ -1191,7 +1191,7 @@ static int qt_write_room(struct tty_struct *tty)
 }
-static int qt_ioctl(struct tty_struct *tty, struct file *file,
+static int qt_ioctl(struct tty_struct *tty,
                    unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -1383,7 +1383,7 @@ static void qt_break(struct tty_struct *tty, int break_state)
 static inline int qt_real_tiocmget(struct tty_struct *tty,
                                   struct usb_serial_port *port,
-                                   struct file *file, struct usb_serial *serial)
+                                   struct usb_serial *serial)
 {
        u8 mcr;
@@ -1425,7 +1425,6 @@ static inline int qt_real_tiocmget(struct tty_struct *tty,
 static inline int qt_real_tiocmset(struct tty_struct *tty,
                                   struct usb_serial_port *port,
-                                   struct file *file,
                                   struct usb_serial *serial,
                                   unsigned int value)
 {
@@ -1462,7 +1461,7 @@ static inline int qt_real_tiocmset(struct tty_struct *tty,
                return 0;
 }
-static int qt_tiocmget(struct tty_struct *tty, struct file *file)
+static int qt_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct usb_serial *serial = get_usb_serial(port, __func__);
@@ -1480,13 +1479,13 @@ static int qt_tiocmget(struct tty_struct *tty, struct file *file)
        dbg("%s - port %d\n", __func__, port->number);
        dbg("%s - port->RxHolding = %d\n", __func__, qt_port->RxHolding);
-        retval = qt_real_tiocmget(tty, port, file, serial);
+        retval = qt_real_tiocmget(tty, port, serial);
        spin_unlock_irqrestore(&qt_port->lock, flags);
        return retval;
 }
-static int qt_tiocmset(struct tty_struct *tty, struct file *file,
+static int qt_tiocmset(struct tty_struct *tty,
                       unsigned int set, unsigned int clear)
 {
@@ -1506,7 +1505,7 @@ static int qt_tiocmset(struct tty_struct *tty, struct file *file,
        dbg("%s - port %d\n", __func__, port->number);
        dbg("%s - qt_port->RxHolding = %d\n", __func__, qt_port->RxHolding);
-        retval = qt_real_tiocmset(tty, port, file, serial, set);
+        retval = qt_real_tiocmset(tty, port, serial, set);
        spin_unlock_irqrestore(&qt_port->lock, flags);
        return retval;
diff --git a/drivers/staging/tty/Kconfig b/drivers/staging/tty/Kconfig
new file mode 100644
index 000000000000..77103a07abbd
--- /dev/null
+++ b/drivers/staging/tty/Kconfig
@@ -0,0 +1,87 @@
+config STALLION
+        tristate "Stallion EasyIO or EC8/32 support"
+        depends on STALDRV && (ISA || EISA || PCI)
+        help
+          If you have an EasyIO or EasyConnection 8/32 multiport Stallion
+          card, then this is for you; say Y.  Make sure to read
+          <file:Documentation/serial/stallion.txt>.
+          To compile this driver as a module, choose M here: the
+          module will be called stallion.
+config ISTALLION
+        tristate "Stallion EC8/64, ONboard, Brumby support"
+        depends on STALDRV && (ISA || EISA || PCI)
+        help
+          If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
+          serial multiport card, say Y here. Make sure to read
+          <file:Documentation/serial/stallion.txt>.
+          To compile this driver as a module, choose M here: the
+          module will be called istallion.
+config DIGIEPCA
+        tristate "Digiboard Intelligent Async Support"
+        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
+        ---help---
+          This is a driver for Digi International's Xx, Xeve, and Xem series
+          of cards which provide multiple serial ports. You would need
+          something like this to connect more than two modems to your Linux
+          box, for instance in order to become a dial-in server. This driver
+          supports the original PC (ISA) boards as well as PCI, and EISA. If
+          you have a card like this, say Y here and read the file
+          <file:Documentation/serial/digiepca.txt>.
+          To compile this driver as a module, choose M here: the
+          module will be called epca.
+config RISCOM8
+        tristate "SDL RISCom/8 card support"
+        depends on SERIAL_NONSTANDARD
+        help
+          This is a driver for the SDL Communications RISCom/8 multiport card,
+          which gives you many serial ports. You would need something like
+          this to connect more than two modems to your Linux box, for instance
+          in order to become a dial-in server. If you have a card like that,
+          say Y here and read the file <file:Documentation/serial/riscom8.txt>.
+          Also it's possible to say M here and compile this driver as kernel
+          loadable module; the module will be called riscom8.
+config SPECIALIX
+        tristate "Specialix IO8+ card support"
+        depends on SERIAL_NONSTANDARD
+        help
+          This is a driver for the Specialix IO8+ multiport card (both the
+          ISA and the PCI version) which gives you many serial ports. You
+          would need something like this to connect more than two modems to
+          your Linux box, for instance in order to become a dial-in server.
+          If you have a card like that, say Y here and read the file
+          <file:Documentation/serial/specialix.txt>. Also it's possible to say
+          M here and compile this driver as kernel loadable module which will be
+          called specialix.
+config COMPUTONE
+        tristate "Computone IntelliPort Plus serial support"
+        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
+        ---help---
+          This driver supports the entire family of Intelliport II/Plus
+          controllers with the exception of the MicroChannel controllers and
+          products previous to the Intelliport II. These are multiport cards,
+          which give you many serial ports. You would need something like this
+          to connect more than two modems to your Linux box, for instance in
+          order to become a dial-in server. If you have a card like that, say
+          Y here and read <file:Documentation/serial/computone.txt>.
+          To compile this driver as module, choose M here: the
+          module will be called ip2.
+config SERIAL167
+        bool "CD2401 support for MVME166/7 serial ports"
+        depends on MVME16x
+        help
+          This is the driver for the serial ports on the Motorola MVME166,
+          167, and 172 boards.  Everyone using one of these boards should say
+          Y here.
diff --git a/drivers/staging/tty/Makefile b/drivers/staging/tty/Makefile
new file mode 100644
index 000000000000..ac57c105611b
--- /dev/null
+++ b/drivers/staging/tty/Makefile
@@ -0,0 +1,7 @@
+obj-$(CONFIG_STALLION)          += stallion.o
+obj-$(CONFIG_ISTALLION)         += istallion.o
+obj-$(CONFIG_DIGIEPCA)          += epca.o
+obj-$(CONFIG_SERIAL167)         += serial167.o
+obj-$(CONFIG_SPECIALIX)         += specialix.o
+obj-$(CONFIG_RISCOM8)           += riscom8.o
+obj-$(CONFIG_COMPUTONE)         += ip2/
diff --git a/drivers/staging/tty/TODO b/drivers/staging/tty/TODO
new file mode 100644
index 000000000000..88756453ac6c
--- /dev/null
+++ b/drivers/staging/tty/TODO
@@ -0,0 +1,6 @@
+These are a few tty/serial drivers that either do not build,
+or work if they do build, or if they seem to work, are for obsolete
+hardware, or are full of unfixable races and no one uses them anymore.
+If no one steps up to adopt any of these drivers, they will be removed
+in the 2.6.41 release.
diff --git a/drivers/char/epca.c b/drivers/staging/tty/epca.c
index d9df46aa0fba..7ad3638967ae 100644
--- a/drivers/char/epca.c
+++ b/drivers/staging/tty/epca.c
@@ -175,9 +175,9 @@ static unsigned termios2digi_i(struct channel *ch, unsigned);
 static unsigned termios2digi_c(struct channel *ch, unsigned);
 static void epcaparam(struct tty_struct *, struct channel *);
 static void receive_data(struct channel *, struct tty_struct *tty);
-static int pc_ioctl(struct tty_struct *, struct file *,
+static int pc_ioctl(struct tty_struct *,
                        unsigned int, unsigned long);
-static int info_ioctl(struct tty_struct *, struct file *,
+static int info_ioctl(struct tty_struct *,
                        unsigned int, unsigned long);
 static void pc_set_termios(struct tty_struct *, struct ktermios *);
 static void do_softint(struct work_struct *work);
@@ -1919,7 +1919,7 @@ static void receive_data(struct channel *ch, struct tty_struct *tty)
        tty_schedule_flip(tty);
 }
-static int info_ioctl(struct tty_struct *tty, struct file *file,
+static int info_ioctl(struct tty_struct *tty,
                    unsigned int cmd, unsigned long arg)
 {
        switch (cmd) {
@@ -1982,7 +1982,7 @@ static int info_ioctl(struct tty_struct *tty, struct file *file,
        return 0;
 }
-static int pc_tiocmget(struct tty_struct *tty, struct file *file)
+static int pc_tiocmget(struct tty_struct *tty)
 {
        struct channel *ch = tty->driver_data;
        struct board_chan __iomem *bc;
@@ -2015,7 +2015,7 @@ static int pc_tiocmget(struct tty_struct *tty, struct file *file)
        return mflag;
 }
-static int pc_tiocmset(struct tty_struct *tty, struct file *file,
+static int pc_tiocmset(struct tty_struct *tty,
                       unsigned int set, unsigned int clear)
 {
        struct channel *ch = tty->driver_data;
@@ -2057,7 +2057,7 @@ static int pc_tiocmset(struct tty_struct *tty, struct file *file,
        return 0;
 }
-static int pc_ioctl(struct tty_struct *tty, struct file *file,
+static int pc_ioctl(struct tty_struct *tty,
                                        unsigned int cmd, unsigned long arg)
 {
        digiflow_t dflow;
@@ -2074,14 +2074,14 @@ static int pc_ioctl(struct tty_struct *tty, struct file *file,
                return -EINVAL;
        switch (cmd) {
        case TIOCMODG:
-                mflag = pc_tiocmget(tty, file);
+                mflag = pc_tiocmget(tty);
                if (put_user(mflag, (unsigned long __user *)argp))
                        return -EFAULT;
                break;
        case TIOCMODS:
                if (get_user(mstat, (unsigned __user *)argp))
                        return -EFAULT;
-                return pc_tiocmset(tty, file, mstat, ~mstat);
+                return pc_tiocmset(tty, mstat, ~mstat);
        case TIOCSDTR:
                spin_lock_irqsave(&epca_lock, flags);
                ch->omodem |= ch->m_dtr;
diff --git a/drivers/char/epca.h b/drivers/staging/tty/epca.h
index d414bf2dbf7c..d414bf2dbf7c 100644
--- a/drivers/char/epca.h
+++ b/drivers/staging/tty/epca.h
diff --git a/drivers/char/epcaconfig.h b/drivers/staging/tty/epcaconfig.h
index 55dec067078e..55dec067078e 100644
--- a/drivers/char/epcaconfig.h
+++ b/drivers/staging/tty/epcaconfig.h
diff --git a/drivers/char/ip2/Makefile b/drivers/staging/tty/ip2/Makefile
index 7b78e0dfc5b0..7b78e0dfc5b0 100644
--- a/drivers/char/ip2/Makefile
+++ b/drivers/staging/tty/ip2/Makefile
diff --git a/drivers/char/ip2/i2cmd.c b/drivers/staging/tty/ip2/i2cmd.c
index e7af647800b6..e7af647800b6 100644
--- a/drivers/char/ip2/i2cmd.c
+++ b/drivers/staging/tty/ip2/i2cmd.c
diff --git a/drivers/char/ip2/i2cmd.h b/drivers/staging/tty/ip2/i2cmd.h
index 29277ec6b8ed..29277ec6b8ed 100644
--- a/drivers/char/ip2/i2cmd.h
+++ b/drivers/staging/tty/ip2/i2cmd.h
diff --git a/drivers/char/ip2/i2ellis.c b/drivers/staging/tty/ip2/i2ellis.c
index 29db44de399f..29db44de399f 100644
--- a/drivers/char/ip2/i2ellis.c
+++ b/drivers/staging/tty/ip2/i2ellis.c
diff --git a/drivers/char/ip2/i2ellis.h b/drivers/staging/tty/ip2/i2ellis.h
index fb6df2456018..fb6df2456018 100644
--- a/drivers/char/ip2/i2ellis.h
+++ b/drivers/staging/tty/ip2/i2ellis.h
diff --git a/drivers/char/ip2/i2hw.h b/drivers/staging/tty/ip2/i2hw.h
index c0ba6c05f0cd..c0ba6c05f0cd 100644
--- a/drivers/char/ip2/i2hw.h
+++ b/drivers/staging/tty/ip2/i2hw.h
diff --git a/drivers/char/ip2/i2lib.c b/drivers/staging/tty/ip2/i2lib.c
index 0d10b89218ed..0d10b89218ed 100644
--- a/drivers/char/ip2/i2lib.c
+++ b/drivers/staging/tty/ip2/i2lib.c
diff --git a/drivers/char/ip2/i2lib.h b/drivers/staging/tty/ip2/i2lib.h
index e559e9bac06d..e559e9bac06d 100644
--- a/drivers/char/ip2/i2lib.h
+++ b/drivers/staging/tty/ip2/i2lib.h
diff --git a/drivers/char/ip2/i2pack.h b/drivers/staging/tty/ip2/i2pack.h
index 00342a677c90..00342a677c90 100644
--- a/drivers/char/ip2/i2pack.h
+++ b/drivers/staging/tty/ip2/i2pack.h
diff --git a/drivers/char/ip2/ip2.h b/drivers/staging/tty/ip2/ip2.h
index 936ccc533949..936ccc533949 100644
--- a/drivers/char/ip2/ip2.h
+++ b/drivers/staging/tty/ip2/ip2.h
diff --git a/drivers/char/ip2/ip2ioctl.h b/drivers/staging/tty/ip2/ip2ioctl.h
index aa0a9da85e05..aa0a9da85e05 100644
--- a/drivers/char/ip2/ip2ioctl.h
+++ b/drivers/staging/tty/ip2/ip2ioctl.h
diff --git a/drivers/char/ip2/ip2main.c b/drivers/staging/tty/ip2/ip2main.c
index c3a025356b8b..ea7a8fb08283 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/staging/tty/ip2/ip2main.c
@@ -173,7 +173,7 @@ static void ip2_flush_chars(PTTY);
 static int  ip2_write_room(PTTY);
 static int  ip2_chars_in_buf(PTTY);
 static void ip2_flush_buffer(PTTY);
-static int  ip2_ioctl(PTTY, struct file *, UINT, ULONG);
+static int  ip2_ioctl(PTTY, UINT, ULONG);
 static void ip2_set_termios(PTTY, struct ktermios *);
 static void ip2_set_line_discipline(PTTY);
 static void ip2_throttle(PTTY);
@@ -181,8 +181,8 @@ static void ip2_unthrottle(PTTY);
 static void ip2_stop(PTTY);
 static void ip2_start(PTTY);
 static void ip2_hangup(PTTY);
-static int  ip2_tiocmget(struct tty_struct *tty, struct file *file);
+static int  ip2_tiocmget(struct tty_struct *tty);
-static int  ip2_tiocmset(struct tty_struct *tty, struct file *file,
+static int  ip2_tiocmset(struct tty_struct *tty,
                         unsigned int set, unsigned int clear);
 static int ip2_get_icount(struct tty_struct *tty,
                struct serial_icounter_struct *icount);
@@ -2038,7 +2038,7 @@ ip2_stop ( PTTY tty )
 /* Device Ioctl Section                                                       */
 /******************************************************************************/
-static int ip2_tiocmget(struct tty_struct *tty, struct file *file)
+static int ip2_tiocmget(struct tty_struct *tty)
 {
        i2ChanStrPtr pCh = DevTable[tty->index];
 #ifdef  ENABLE_DSSNOW
@@ -2085,7 +2085,7 @@ static int ip2_tiocmget(struct tty_struct *tty, struct file *file)
              | ((pCh->dataSetIn  & I2_CTS) ? TIOCM_CTS : 0);
 }
-static int ip2_tiocmset(struct tty_struct *tty, struct file *file,
+static int ip2_tiocmset(struct tty_struct *tty,
                        unsigned int set, unsigned int clear)
 {
        i2ChanStrPtr pCh = DevTable[tty->index];
@@ -2127,7 +2127,7 @@ static int ip2_tiocmset(struct tty_struct *tty, struct file *file,
 /*                                                                            */
 /******************************************************************************/
 static int
-ip2_ioctl ( PTTY tty, struct file *pFile, UINT cmd, ULONG arg )
+ip2_ioctl ( PTTY tty, UINT cmd, ULONG arg )
 {
        wait_queue_t wait;
        i2ChanStrPtr pCh = DevTable[tty->index];
diff --git a/drivers/char/ip2/ip2trace.h b/drivers/staging/tty/ip2/ip2trace.h
index da20435dc8a6..da20435dc8a6 100644
--- a/drivers/char/ip2/ip2trace.h
+++ b/drivers/staging/tty/ip2/ip2trace.h
diff --git a/drivers/char/ip2/ip2types.h b/drivers/staging/tty/ip2/ip2types.h
index 9d67b260b2f6..9d67b260b2f6 100644
--- a/drivers/char/ip2/ip2types.h
+++ b/drivers/staging/tty/ip2/ip2types.h
diff --git a/drivers/char/istallion.c b/drivers/staging/tty/istallion.c
index 7c6de4c92458..0b266272cccd 100644
--- a/drivers/char/istallion.c
+++ b/drivers/staging/tty/istallion.c
@@ -603,7 +603,7 @@ static int	stli_putchar(struct tty_struct *tty, unsigned char ch);
 static void     stli_flushchars(struct tty_struct *tty);
 static int      stli_writeroom(struct tty_struct *tty);
 static int      stli_charsinbuffer(struct tty_struct *tty);
-static int      stli_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg);
+static int      stli_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg);
 static void     stli_settermios(struct tty_struct *tty, struct ktermios *old);
 static void     stli_throttle(struct tty_struct *tty);
 static void     stli_unthrottle(struct tty_struct *tty);
@@ -1501,7 +1501,7 @@ static int stli_setserial(struct tty_struct *tty, struct serial_struct __user *s
 /*****************************************************************************/
-static int stli_tiocmget(struct tty_struct *tty, struct file *file)
+static int stli_tiocmget(struct tty_struct *tty)
 {
        struct stliport *portp = tty->driver_data;
        struct stlibrd *brdp;
@@ -1524,7 +1524,7 @@ static int stli_tiocmget(struct tty_struct *tty, struct file *file)
        return stli_mktiocm(portp->asig.sigvalue);
 }
-static int stli_tiocmset(struct tty_struct *tty, struct file *file,
+static int stli_tiocmset(struct tty_struct *tty,
                         unsigned int set, unsigned int clear)
 {
        struct stliport *portp = tty->driver_data;
@@ -1556,7 +1556,7 @@ static int stli_tiocmset(struct tty_struct *tty, struct file *file,
                            sizeof(asysigs_t), 0);
 }
-static int stli_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg)
+static int stli_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg)
 {
        struct stliport *portp;
        struct stlibrd *brdp;
diff --git a/drivers/char/riscom8.c b/drivers/staging/tty/riscom8.c
index af4de1fe8445..602643a40b4b 100644
--- a/drivers/char/riscom8.c
+++ b/drivers/staging/tty/riscom8.c
@@ -1086,7 +1086,7 @@ static int rc_chars_in_buffer(struct tty_struct *tty)
        return port->xmit_cnt;
 }
-static int rc_tiocmget(struct tty_struct *tty, struct file *file)
+static int rc_tiocmget(struct tty_struct *tty)
 {
        struct riscom_port *port = tty->driver_data;
        struct riscom_board *bp;
@@ -1115,8 +1115,8 @@ static int rc_tiocmget(struct tty_struct *tty, struct file *file)
        return result;
 }
-static int rc_tiocmset(struct tty_struct *tty, struct file *file,
+static int rc_tiocmset(struct tty_struct *tty,
-                       unsigned int set, unsigned int clear)
+                                       unsigned int set, unsigned int clear)
 {
        struct riscom_port *port = tty->driver_data;
        unsigned long flags;
@@ -1236,7 +1236,7 @@ static int rc_get_serial_info(struct riscom_port *port,
        return copy_to_user(retinfo, &tmp, sizeof(tmp)) ? -EFAULT : 0;
 }
-static int rc_ioctl(struct tty_struct *tty, struct file *filp,
+static int rc_ioctl(struct tty_struct *tty,
                    unsigned int cmd, unsigned long arg)
 {
        struct riscom_port *port = tty->driver_data;
diff --git a/drivers/char/riscom8.h b/drivers/staging/tty/riscom8.h
index c9876b3f9714..c9876b3f9714 100644
--- a/drivers/char/riscom8.h
+++ b/drivers/staging/tty/riscom8.h
diff --git a/drivers/char/riscom8_reg.h b/drivers/staging/tty/riscom8_reg.h
index a32475ed0d18..a32475ed0d18 100644
--- a/drivers/char/riscom8_reg.h
+++ b/drivers/staging/tty/riscom8_reg.h
diff --git a/drivers/char/serial167.c b/drivers/staging/tty/serial167.c
index 748c3b0ecd89..674af6933978 100644
--- a/drivers/char/serial167.c
+++ b/drivers/staging/tty/serial167.c
@@ -1308,7 +1308,7 @@ check_and_exit:
        return startup(info);
 }                               /* set_serial_info */
-static int cy_tiocmget(struct tty_struct *tty, struct file *file)
+static int cy_tiocmget(struct tty_struct *tty)
 {
        struct cyclades_port *info = tty->driver_data;
        int channel;
@@ -1331,8 +1331,7 @@ static int cy_tiocmget(struct tty_struct *tty, struct file *file)
 }                               /* cy_tiocmget */
 static int
-cy_tiocmset(struct tty_struct *tty, struct file *file,
+cy_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear)
-            unsigned int set, unsigned int clear)
 {
        struct cyclades_port *info = tty->driver_data;
        int channel;
@@ -1493,7 +1492,7 @@ get_default_timeout(struct cyclades_port *info, unsigned long __user * value)
 }
 static int
-cy_ioctl(struct tty_struct *tty, struct file *file,
+cy_ioctl(struct tty_struct *tty,
         unsigned int cmd, unsigned long arg)
 {
        struct cyclades_port *info = tty->driver_data;
diff --git a/drivers/char/specialix.c b/drivers/staging/tty/specialix.c
index c2bca3f25ef3..47e5753f732a 100644
--- a/drivers/char/specialix.c
+++ b/drivers/staging/tty/specialix.c
@@ -1737,7 +1737,7 @@ static int sx_chars_in_buffer(struct tty_struct *tty)
        return port->xmit_cnt;
 }
-static int sx_tiocmget(struct tty_struct *tty, struct file *file)
+static int sx_tiocmget(struct tty_struct *tty)
 {
        struct specialix_port *port = tty->driver_data;
        struct specialix_board *bp;
@@ -1778,7 +1778,7 @@ static int sx_tiocmget(struct tty_struct *tty, struct file *file)
 }
-static int sx_tiocmset(struct tty_struct *tty, struct file *file,
+static int sx_tiocmset(struct tty_struct *tty,
                       unsigned int set, unsigned int clear)
 {
        struct specialix_port *port = tty->driver_data;
@@ -1928,7 +1928,7 @@ static int sx_get_serial_info(struct specialix_port *port,
 }
-static int sx_ioctl(struct tty_struct *tty, struct file *filp,
+static int sx_ioctl(struct tty_struct *tty,
                                unsigned int cmd, unsigned long arg)
 {
        struct specialix_port *port = tty->driver_data;
diff --git a/drivers/char/specialix_io8.h b/drivers/staging/tty/specialix_io8.h
index c63005274d9b..c63005274d9b 100644
--- a/drivers/char/specialix_io8.h
+++ b/drivers/staging/tty/specialix_io8.h
diff --git a/drivers/char/stallion.c b/drivers/staging/tty/stallion.c
index 461a5a045517..4fff5cd3b163 100644
--- a/drivers/char/stallion.c
+++ b/drivers/staging/tty/stallion.c
@@ -1094,7 +1094,7 @@ static int stl_setserial(struct tty_struct *tty, struct serial_struct __user *sp
 /*****************************************************************************/
-static int stl_tiocmget(struct tty_struct *tty, struct file *file)
+static int stl_tiocmget(struct tty_struct *tty)
 {
        struct stlport  *portp;
@@ -1107,7 +1107,7 @@ static int stl_tiocmget(struct tty_struct *tty, struct file *file)
        return stl_getsignals(portp);
 }
-static int stl_tiocmset(struct tty_struct *tty, struct file *file,
+static int stl_tiocmset(struct tty_struct *tty,
                        unsigned int set, unsigned int clear)
 {
        struct stlport  *portp;
@@ -1132,14 +1132,13 @@ static int stl_tiocmset(struct tty_struct *tty, struct file *file,
        return 0;
 }
-static int stl_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg)
+static int stl_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg)
 {
        struct stlport  *portp;
        int             rc;
        void __user *argp = (void __user *)arg;
-        pr_debug("stl_ioctl(tty=%p,file=%p,cmd=%x,arg=%lx)\n", tty, file, cmd,
+        pr_debug("stl_ioctl(tty=%p,cmd=%x,arg=%lx)\n", tty, cmd, arg);
-                        arg);
        portp = tty->driver_data;
        if (portp == NULL)
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
new file mode 100644
index 000000000000..3fd7199301b6
--- /dev/null
+++ b/drivers/tty/Kconfig
@@ -0,0 +1,321 @@
+config VT
+        bool "Virtual terminal" if EXPERT
+        depends on !S390
+        select INPUT
+        default y
+        ---help---
+          If you say Y here, you will get support for terminal devices with
+          display and keyboard devices. These are called "virtual" because you
+          can run several virtual terminals (also called virtual consoles) on
+          one physical terminal. This is rather useful, for example one
+          virtual terminal can collect system messages and warnings, another
+          one can be used for a text-mode user session, and a third could run
+          an X session, all in parallel. Switching between virtual terminals
+          is done with certain key combinations, usually Alt-<function key>.
+          The setterm command ("man setterm") can be used to change the
+          properties (such as colors or beeping) of a virtual terminal. The
+          man page console_codes(4) ("man console_codes") contains the special
+          character sequences that can be used to change those properties
+          directly. The fonts used on virtual terminals can be changed with
+          the setfont ("man setfont") command and the key bindings are defined
+          with the loadkeys ("man loadkeys") command.
+          You need at least one virtual terminal device in order to make use
+          of your keyboard and monitor. Therefore, only people configuring an
+          embedded system would want to say N here in order to save some
+          memory; the only way to log into such a system is then via a serial
+          or network connection.
+          If unsure, say Y, or else you won't be able to do much with your new
+          shiny Linux system :-)
+config CONSOLE_TRANSLATIONS
+        depends on VT
+        default y
+        bool "Enable character translations in console" if EXPERT
+        ---help---
+          This enables support for font mapping and Unicode translation
+          on virtual consoles.
+config VT_CONSOLE
+        bool "Support for console on virtual terminal" if EXPERT
+        depends on VT
+        default y
+        ---help---
+          The system console is the device which receives all kernel messages
+          and warnings and which allows logins in single user mode. If you
+          answer Y here, a virtual terminal (the device used to interact with
+          a physical terminal) can be used as system console. This is the most
+          common mode of operations, so you should say Y here unless you want
+          the kernel messages be output only to a serial port (in which case
+          you should say Y to "Console on serial port", below).
+          If you do say Y here, by default the currently visible virtual
+          terminal (/dev/tty0) will be used as system console. You can change
+          that with a kernel command line option such as "console=tty3" which
+          would use the third virtual terminal as system console. (Try "man
+          bootparam" or see the documentation of your boot loader (lilo or
+          loadlin) about how to pass options to the kernel at boot time.)
+          If unsure, say Y.
+config HW_CONSOLE
+        bool
+        depends on VT && !S390 && !UML
+        default y
+config VT_HW_CONSOLE_BINDING
+       bool "Support for binding and unbinding console drivers"
+       depends on HW_CONSOLE
+       default n
+       ---help---
+         The virtual terminal is the device that interacts with the physical
+         terminal through console drivers. On these systems, at least one
+         console driver is loaded. In other configurations, additional console
+         drivers may be enabled, such as the framebuffer console. If more than
+         1 console driver is enabled, setting this to 'y' will allow you to
+         select the console driver that will serve as the backend for the
+         virtual terminals.
+         See <file:Documentation/console/console.txt> for more
+         information. For framebuffer console users, please refer to
+         <file:Documentation/fb/fbcon.txt>.
+config UNIX98_PTYS
+        bool "Unix98 PTY support" if EXPERT
+        default y
+        ---help---
+          A pseudo terminal (PTY) is a software device consisting of two
+          halves: a master and a slave. The slave device behaves identical to
+          a physical terminal; the master device is used by a process to
+          read data from and write data to the slave, thereby emulating a
+          terminal. Typical programs for the master side are telnet servers
+          and xterms.
+          Linux has traditionally used the BSD-like names /dev/ptyxx for
+          masters and /dev/ttyxx for slaves of pseudo terminals. This scheme
+          has a number of problems. The GNU C library glibc 2.1 and later,
+          however, supports the Unix98 naming standard: in order to acquire a
+          pseudo terminal, a process opens /dev/ptmx; the number of the pseudo
+          terminal is then made available to the process and the pseudo
+          terminal slave can be accessed as /dev/pts/<number>. What was
+          traditionally /dev/ttyp2 will then be /dev/pts/2, for example.
+          All modern Linux systems use the Unix98 ptys.  Say Y unless
+          you're on an embedded system and want to conserve memory.
+config DEVPTS_MULTIPLE_INSTANCES
+        bool "Support multiple instances of devpts"
+        depends on UNIX98_PTYS
+        default n
+        ---help---
+          Enable support for multiple instances of devpts filesystem.
+          If you want to have isolated PTY namespaces (eg: in containers),
+          say Y here.  Otherwise, say N. If enabled, each mount of devpts
+          filesystem with the '-o newinstance' option will create an
+          independent PTY namespace.
+config LEGACY_PTYS
+        bool "Legacy (BSD) PTY support"
+        default y
+        ---help---
+          A pseudo terminal (PTY) is a software device consisting of two
+          halves: a master and a slave. The slave device behaves identical to
+          a physical terminal; the master device is used by a process to
+          read data from and write data to the slave, thereby emulating a
+          terminal. Typical programs for the master side are telnet servers
+          and xterms.
+          Linux has traditionally used the BSD-like names /dev/ptyxx
+          for masters and /dev/ttyxx for slaves of pseudo
+          terminals. This scheme has a number of problems, including
+          security.  This option enables these legacy devices; on most
+          systems, it is safe to say N.
+config LEGACY_PTY_COUNT
+        int "Maximum number of legacy PTY in use"
+        depends on LEGACY_PTYS
+        range 0 256
+        default "256"
+        ---help---
+          The maximum number of legacy PTYs that can be used at any one time.
+          The default is 256, and should be more than enough.  Embedded
+          systems may want to reduce this to save memory.
+          When not in use, each legacy PTY occupies 12 bytes on 32-bit
+          architectures and 24 bytes on 64-bit architectures.
+config BFIN_JTAG_COMM
+        tristate "Blackfin JTAG Communication"
+        depends on BLACKFIN
+        help
+          Add support for emulating a TTY device over the Blackfin JTAG.
+          To compile this driver as a module, choose M here: the
+          module will be called bfin_jtag_comm.
+config BFIN_JTAG_COMM_CONSOLE
+        bool "Console on Blackfin JTAG"
+        depends on BFIN_JTAG_COMM=y
+config SERIAL_NONSTANDARD
+        bool "Non-standard serial port support"
+        depends on HAS_IOMEM
+        ---help---
+          Say Y here if you have any non-standard serial boards -- boards
+          which aren't supported using the standard "dumb" serial driver.
+          This includes intelligent serial boards such as Cyclades,
+          Digiboards, etc. These are usually used for systems that need many
+          serial ports because they serve many terminals or dial-in
+          connections.
+          Note that the answer to this question won't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about non-standard serial boards.
+          Most people can say N here.
+config ROCKETPORT
+        tristate "Comtrol RocketPort support"
+        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
+        help
+          This driver supports Comtrol RocketPort and RocketModem PCI boards.   
+          These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
+          modems.  For information about the RocketPort/RocketModem  boards
+          and this driver read <file:Documentation/serial/rocket.txt>.
+          To compile this driver as a module, choose M here: the
+          module will be called rocket.
+          If you want to compile this driver into the kernel, say Y here.  If
+          you don't have a Comtrol RocketPort/RocketModem card installed, say N.
+config CYCLADES
+        tristate "Cyclades async mux support"
+        depends on SERIAL_NONSTANDARD && (PCI || ISA)
+        select FW_LOADER
+        ---help---
+          This driver supports Cyclades Z and Y multiserial boards.
+          You would need something like this to connect more than two modems to
+          your Linux box, for instance in order to become a dial-in server.
+          For information about the Cyclades-Z card, read
+          <file:Documentation/serial/README.cycladesZ>.
+          To compile this driver as a module, choose M here: the
+          module will be called cyclades.
+          If you haven't heard about it, it's safe to say N.
+config CYZ_INTR
+        bool "Cyclades-Z interrupt mode operation (EXPERIMENTAL)"
+        depends on EXPERIMENTAL && CYCLADES
+        help
+          The Cyclades-Z family of multiport cards allows 2 (two) driver op
+          modes: polling and interrupt. In polling mode, the driver will check
+          the status of the Cyclades-Z ports every certain amount of time
+          (which is called polling cycle and is configurable). In interrupt
+          mode, it will use an interrupt line (IRQ) in order to check the
+          status of the Cyclades-Z ports. The default op mode is polling. If
+          unsure, say N.
+config MOXA_INTELLIO
+        tristate "Moxa Intellio support"
+        depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)
+        select FW_LOADER
+        help
+          Say Y here if you have a Moxa Intellio multiport serial card.
+          To compile this driver as a module, choose M here: the
+          module will be called moxa.
+config MOXA_SMARTIO
+        tristate "Moxa SmartIO support v. 2.0"
+        depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
+        help
+          Say Y here if you have a Moxa SmartIO multiport serial card and/or
+          want to help develop a new version of this driver.
+          This is upgraded (1.9.1) driver from original Moxa drivers with
+          changes finally resulting in PCI probing.
+          This driver can also be built as a module. The module will be called
+          mxser. If you want to do that, say M here.
+config SYNCLINK
+        tristate "Microgate SyncLink card support"
+        depends on SERIAL_NONSTANDARD && PCI && ISA_DMA_API
+        help
+          Provides support for the SyncLink ISA and PCI multiprotocol serial
+          adapters. These adapters support asynchronous and HDLC bit
+          synchronous communication up to 10Mbps (PCI adapter).
+          This driver can only be built as a module ( = code which can be
+          inserted in and removed from the running kernel whenever you want).
+          The module will be called synclink.  If you want to do that, say M
+          here.
+config SYNCLINKMP
+        tristate "SyncLink Multiport support"
+        depends on SERIAL_NONSTANDARD && PCI
+        help
+          Enable support for the SyncLink Multiport (2 or 4 ports)
+          serial adapter, running asynchronous and HDLC communications up
+          to 2.048Mbps. Each ports is independently selectable for
+          RS-232, V.35, RS-449, RS-530, and X.21
+          This driver may be built as a module ( = code which can be
+          inserted in and removed from the running kernel whenever you want).
+          The module will be called synclinkmp.  If you want to do that, say M
+          here.
+config SYNCLINK_GT
+        tristate "SyncLink GT/AC support"
+        depends on SERIAL_NONSTANDARD && PCI
+        help
+          Support for SyncLink GT and SyncLink AC families of
+          synchronous and asynchronous serial adapters
+          manufactured by Microgate Systems, Ltd. (www.microgate.com)
+config NOZOMI
+        tristate "HSDPA Broadband Wireless Data Card - Globe Trotter"
+        depends on PCI && EXPERIMENTAL
+        help
+          If you have a HSDPA driver Broadband Wireless Data Card -
+          Globe Trotter PCMCIA card, say Y here.
+          To compile this driver as a module, choose M here, the module
+          will be called nozomi.
+config ISI
+        tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
+        depends on SERIAL_NONSTANDARD && PCI
+        select FW_LOADER
+        help
+          This is a driver for the Multi-Tech cards which provide several
+          serial ports.  The driver is experimental and can currently only be
+          built as a module. The module will be called isicom.
+          If you want to do that, choose M here.
+config N_HDLC
+        tristate "HDLC line discipline support"
+        depends on SERIAL_NONSTANDARD
+        help
+          Allows synchronous HDLC communications with tty device drivers that
+          support synchronous HDLC such as the Microgate SyncLink adapter.
+          This driver can be built as a module ( = code which can be
+          inserted in and removed from the running kernel whenever you want).
+          The module will be called n_hdlc. If you want to do that, say M
+          here.
+config N_GSM
+        tristate "GSM MUX line discipline support (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
+        depends on NET
+        help
+          This line discipline provides support for the GSM MUX protocol and
+          presents the mux as a set of 61 individual tty devices.
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index 396277216e4f..690522fcb338 100644
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -11,3 +11,18 @@ obj-$(CONFIG_R3964)		+= n_r3964.o
 obj-y                           += vt/
 obj-$(CONFIG_HVC_DRIVER)        += hvc/
 obj-y                           += serial/
+# tty drivers
+obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
+obj-$(CONFIG_BFIN_JTAG_COMM)    += bfin_jtag_comm.o
+obj-$(CONFIG_CYCLADES)          += cyclades.o
+obj-$(CONFIG_ISI)               += isicom.o
+obj-$(CONFIG_MOXA_INTELLIO)     += moxa.o
+obj-$(CONFIG_MOXA_SMARTIO)      += mxser.o
+obj-$(CONFIG_NOZOMI)            += nozomi.o
+obj-$(CONFIG_ROCKETPORT)        += rocket.o
+obj-$(CONFIG_SYNCLINK_GT)       += synclink_gt.o
+obj-$(CONFIG_SYNCLINKMP)        += synclinkmp.o
+obj-$(CONFIG_SYNCLINK)          += synclink.o
+obj-y += ipwireless/
diff --git a/drivers/char/amiserial.c b/drivers/tty/amiserial.c
index 6ee3348bc3e4..f214e5022472 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -1194,7 +1194,7 @@ static int get_lsr_info(struct async_struct * info, unsigned int __user *value)
 }
-static int rs_tiocmget(struct tty_struct *tty, struct file *file)
+static int rs_tiocmget(struct tty_struct *tty)
 {
        struct async_struct * info = tty->driver_data;
        unsigned char control, status;
@@ -1216,8 +1216,8 @@ static int rs_tiocmget(struct tty_struct *tty, struct file *file)
                | (!(status  & SER_CTS) ? TIOCM_CTS : 0);
 }
-static int rs_tiocmset(struct tty_struct *tty, struct file *file,
+static int rs_tiocmset(struct tty_struct *tty, unsigned int set,
-                       unsigned int set, unsigned int clear)
+                                                unsigned int clear)
 {
        struct async_struct * info = tty->driver_data;
        unsigned long flags;
@@ -1293,7 +1293,7 @@ static int rs_get_icount(struct tty_struct *tty,
        return 0;
 }
-static int rs_ioctl(struct tty_struct *tty, struct file * file,
+static int rs_ioctl(struct tty_struct *tty,
                    unsigned int cmd, unsigned long arg)
 {
        struct async_struct * info = tty->driver_data;
diff --git a/drivers/char/bfin_jtag_comm.c b/drivers/tty/bfin_jtag_comm.c
index 16402445f2b2..16402445f2b2 100644
--- a/drivers/char/bfin_jtag_comm.c
+++ b/drivers/tty/bfin_jtag_comm.c
diff --git a/drivers/char/cyclades.c b/drivers/tty/cyclades.c
index 4f152c28f40e..c99728f0cd9f 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -2429,7 +2429,7 @@ static int get_lsr_info(struct cyclades_port *info, unsigned int __user *value)
        return put_user(result, (unsigned long __user *)value);
 }
-static int cy_tiocmget(struct tty_struct *tty, struct file *file)
+static int cy_tiocmget(struct tty_struct *tty)
 {
        struct cyclades_port *info = tty->driver_data;
        struct cyclades_card *card;
@@ -2483,7 +2483,7 @@ end:
 }                               /* cy_tiomget */
 static int
-cy_tiocmset(struct tty_struct *tty, struct file *file,
+cy_tiocmset(struct tty_struct *tty,
                unsigned int set, unsigned int clear)
 {
        struct cyclades_port *info = tty->driver_data;
@@ -2680,7 +2680,7 @@ static int cy_cflags_changed(struct cyclades_port *info, unsigned long arg,
 * not recognized by the driver, it should return ENOIOCTLCMD.
 */
 static int
-cy_ioctl(struct tty_struct *tty, struct file *file,
+cy_ioctl(struct tty_struct *tty,
         unsigned int cmd, unsigned long arg)
 {
        struct cyclades_port *info = tty->driver_data;
diff --git a/drivers/tty/hvc/Kconfig b/drivers/tty/hvc/Kconfig
new file mode 100644
index 000000000000..6f2c9809f1fb
--- /dev/null
+++ b/drivers/tty/hvc/Kconfig
@@ -0,0 +1,105 @@
+config HVC_DRIVER
+        bool
+        help
+          Generic "hypervisor virtual console" infrastructure for various
+          hypervisors (pSeries, iSeries, Xen, lguest).
+          It will automatically be selected if one of the back-end console drivers
+          is selected.
+config HVC_IRQ
+        bool
+config HVC_CONSOLE
+        bool "pSeries Hypervisor Virtual Console support"
+        depends on PPC_PSERIES
+        select HVC_DRIVER
+        select HVC_IRQ
+        help
+          pSeries machines when partitioned support a hypervisor virtual
+          console. This driver allows each pSeries partition to have a console
+          which is accessed via the HMC.
+config HVC_ISERIES
+        bool "iSeries Hypervisor Virtual Console support"
+        depends on PPC_ISERIES
+        default y
+        select HVC_DRIVER
+        select HVC_IRQ
+        select VIOPATH
+        help
+          iSeries machines support a hypervisor virtual console.
+config HVC_RTAS
+        bool "IBM RTAS Console support"
+        depends on PPC_RTAS
+        select HVC_DRIVER
+        help
+          IBM Console device driver which makes use of RTAS
+config HVC_BEAT
+        bool "Toshiba's Beat Hypervisor Console support"
+        depends on PPC_CELLEB
+        select HVC_DRIVER
+        help
+          Toshiba's Cell Reference Set Beat Console device driver
+config HVC_IUCV
+        bool "z/VM IUCV Hypervisor console support (VM only)"
+        depends on S390
+        select HVC_DRIVER
+        select IUCV
+        default y
+        help
+          This driver provides a Hypervisor console (HVC) back-end to access
+          a Linux (console) terminal via a z/VM IUCV communication path.
+config HVC_XEN
+        bool "Xen Hypervisor Console support"
+        depends on XEN
+        select HVC_DRIVER
+        select HVC_IRQ
+        default y
+        help
+          Xen virtual console device driver
+config HVC_UDBG
+       bool "udbg based fake hypervisor console"
+       depends on PPC && EXPERIMENTAL
+       select HVC_DRIVER
+       default n
+config HVC_DCC
+       bool "ARM JTAG DCC console"
+       depends on ARM
+       select HVC_DRIVER
+       help
+         This console uses the JTAG DCC on ARM to create a console under the HVC
+         driver. This console is used through a JTAG only on ARM. If you don't have
+         a JTAG then you probably don't want this option.
+config HVC_BFIN_JTAG
+        bool "Blackfin JTAG console"
+        depends on BLACKFIN
+        select HVC_DRIVER
+        help
+         This console uses the Blackfin JTAG to create a console under the
+         the HVC driver.  If you don't have JTAG, then you probably don't
+         want this option.
+config HVCS
+        tristate "IBM Hypervisor Virtual Console Server support"
+        depends on PPC_PSERIES && HVC_CONSOLE
+        help
+          Partitionable IBM Power5 ppc64 machines allow hosting of
+          firmware virtual consoles from one Linux partition by
+          another Linux partition.  This driver allows console data
+          from Linux partitions to be accessed through TTY device
+          interfaces in the device tree of a Linux partition running
+          this driver.
+          To compile this driver as a module, choose M here: the
+          module will be called hvcs.  Additionally, this module
+          will depend on arch specific APIs exported from hvcserver.ko
+          which will also be compiled when this driver is built as a
+          module.
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile
index d79e7e9bf9d2..40a25d93fe52 100644
--- a/drivers/tty/hvc/Makefile
+++ b/drivers/tty/hvc/Makefile
@@ -9,4 +9,5 @@ obj-$(CONFIG_HVC_IRQ)		+= hvc_irq.o
 obj-$(CONFIG_HVC_XEN)           += hvc_xen.o
 obj-$(CONFIG_HVC_IUCV)          += hvc_iucv.o
 obj-$(CONFIG_HVC_UDBG)          += hvc_udbg.o
+obj-$(CONFIG_HVC_BFIN_JTAG)     += hvc_bfin_jtag.o
 obj-$(CONFIG_HVCS)              += hvcs.o
diff --git a/drivers/tty/hvc/hvc_bfin_jtag.c b/drivers/tty/hvc/hvc_bfin_jtag.c
new file mode 100644
index 000000000000..31d6cc6a77af
--- /dev/null
+++ b/drivers/tty/hvc/hvc_bfin_jtag.c
@@ -0,0 +1,105 @@
+/*
+ * Console via Blackfin JTAG Communication
+ *
+ * Copyright 2008-2011 Analog Devices Inc.
+ *
+ * Enter bugs at http://blackfin.uclinux.org/
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#include <linux/console.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/moduleparam.h>
+#include <linux/types.h>
+#include "hvc_console.h"
+/* See the Debug/Emulation chapter in the HRM */
+#define EMUDOF   0x00000001     /* EMUDAT_OUT full & valid */
+#define EMUDIF   0x00000002     /* EMUDAT_IN full & valid */
+#define EMUDOOVF 0x00000004     /* EMUDAT_OUT overflow */
+#define EMUDIOVF 0x00000008     /* EMUDAT_IN overflow */
+/* Helper functions to glue the register API to simple C operations */
+static inline uint32_t bfin_write_emudat(uint32_t emudat)
+{
+        __asm__ __volatile__("emudat = %0;" : : "d"(emudat));
+        return emudat;
+}
+static inline uint32_t bfin_read_emudat(void)
+{
+        uint32_t emudat;
+        __asm__ __volatile__("%0 = emudat;" : "=d"(emudat));
+        return emudat;
+}
+/* Send data to the host */
+static int hvc_bfin_put_chars(uint32_t vt, const char *buf, int count)
+{
+        static uint32_t outbound_len;
+        uint32_t emudat;
+        int ret;
+        if (bfin_read_DBGSTAT() & EMUDOF)
+                return 0;
+        if (!outbound_len) {
+                outbound_len = count;
+                bfin_write_emudat(outbound_len);
+                return 0;
+        }
+        ret = min(outbound_len, (uint32_t)4);
+        memcpy(&emudat, buf, ret);
+        bfin_write_emudat(emudat);
+        outbound_len -= ret;
+        return ret;
+}
+/* Receive data from the host */
+static int hvc_bfin_get_chars(uint32_t vt, char *buf, int count)
+{
+        static uint32_t inbound_len;
+        uint32_t emudat;
+        int ret;
+        if (!(bfin_read_DBGSTAT() & EMUDIF))
+                return 0;
+        emudat = bfin_read_emudat();
+        if (!inbound_len) {
+                inbound_len = emudat;
+                return 0;
+        }
+        ret = min(inbound_len, (uint32_t)4);
+        memcpy(buf, &emudat, ret);
+        inbound_len -= ret;
+        return ret;
+}
+/* Glue the HVC layers to the Blackfin layers */
+static const struct hv_ops hvc_bfin_get_put_ops = {
+        .get_chars = hvc_bfin_get_chars,
+        .put_chars = hvc_bfin_put_chars,
+};
+static int __init hvc_bfin_console_init(void)
+{
+        hvc_instantiate(0, 0, &hvc_bfin_get_put_ops);
+        return 0;
+}
+console_initcall(hvc_bfin_console_init);
+static int __init hvc_bfin_init(void)
+{
+        hvc_alloc(0, 0, &hvc_bfin_get_put_ops, 128);
+        return 0;
+}
+device_initcall(hvc_bfin_init);
diff --git a/drivers/tty/hvc/hvc_dcc.c b/drivers/tty/hvc/hvc_dcc.c
index 6470f63deb4b..435f6facbc23 100644
--- a/drivers/tty/hvc/hvc_dcc.c
+++ b/drivers/tty/hvc/hvc_dcc.c
@@ -33,54 +33,29 @@
 static inline u32 __dcc_getstatus(void)
 {
        u32 __ret;
+        asm volatile("mrc p14, 0, %0, c0, c1, 0 @ read comms ctrl reg"
-        asm("mrc p14, 0, %0, c0, c1, 0  @ read comms ctrl reg"
                : "=r" (__ret) : : "cc");
        return __ret;
 }
-#if defined(CONFIG_CPU_V7)
 static inline char __dcc_getchar(void)
 {
        char __c;
-        asm("get_wait:  mrc p14, 0, pc, c0, c1, 0                          \n\
+        asm volatile("mrc p14, 0, %0, c0, c5, 0 @ read comms data reg"
-                        bne get_wait                                       \n\
-                        mrc p14, 0, %0, c0, c5, 0       @ read comms data reg"
-                : "=r" (__c) : : "cc");
-        return __c;
-}
-#else
-static inline char __dcc_getchar(void)
-{
-        char __c;
-        asm("mrc p14, 0, %0, c0, c5, 0  @ read comms data reg"
                : "=r" (__c));
        return __c;
 }
-#endif
-#if defined(CONFIG_CPU_V7)
-static inline void __dcc_putchar(char c)
-{
-        asm("put_wait:  mrc p14, 0, pc, c0, c1, 0                 \n\
-                        bcs put_wait                              \n\
-                        mcr p14, 0, %0, c0, c5, 0                   "
-        : : "r" (c) : "cc");
-}
-#else
 static inline void __dcc_putchar(char c)
 {
-        asm("mcr p14, 0, %0, c0, c5, 0  @ write a char"
+        asm volatile("mcr p14, 0, %0, c0, c5, 0 @ write a char"
                : /* no output register */
                : "r" (c));
 }
-#endif
 static int hvc_dcc_put_chars(uint32_t vt, const char *buf, int count)
 {
@@ -90,7 +65,7 @@ static int hvc_dcc_put_chars(uint32_t vt, const char *buf, int count)
                while (__dcc_getstatus() & DCC_STATUS_TX)
                        cpu_relax();
-                __dcc_putchar((char)(buf[i] & 0xFF));
+                __dcc_putchar(buf[i]);
        }
        return count;
@@ -100,15 +75,11 @@ static int hvc_dcc_get_chars(uint32_t vt, char *buf, int count)
 {
        int i;
-        for (i = 0; i < count; ++i) {
+        for (i = 0; i < count; ++i)
-                int c = -1;
                if (__dcc_getstatus() & DCC_STATUS_RX)
-                        c = __dcc_getchar();
+                        buf[i] = __dcc_getchar();
-                if (c < 0)
+                else
                        break;
-                buf[i] = c;
-        }
        return i;
 }
diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
index 67a75a502c01..8a8d6373f164 100644
--- a/drivers/tty/hvc/hvsi.c
+++ b/drivers/tty/hvc/hvsi.c
@@ -1095,7 +1095,7 @@ static void hvsi_unthrottle(struct tty_struct *tty)
        h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
 }
-static int hvsi_tiocmget(struct tty_struct *tty, struct file *file)
+static int hvsi_tiocmget(struct tty_struct *tty)
 {
        struct hvsi_struct *hp = tty->driver_data;
@@ -1103,8 +1103,8 @@ static int hvsi_tiocmget(struct tty_struct *tty, struct file *file)
        return hp->mctrl;
 }
-static int hvsi_tiocmset(struct tty_struct *tty, struct file *file,
+static int hvsi_tiocmset(struct tty_struct *tty,
-                unsigned int set, unsigned int clear)
+                                unsigned int set, unsigned int clear)
 {
        struct hvsi_struct *hp = tty->driver_data;
        unsigned long flags;
diff --git a/drivers/char/pcmcia/ipwireless/Makefile b/drivers/tty/ipwireless/Makefile
index db80873d7f20..db80873d7f20 100644
--- a/drivers/char/pcmcia/ipwireless/Makefile
+++ b/drivers/tty/ipwireless/Makefile
diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/tty/ipwireless/hardware.c
index 0aeb5a38d296..0aeb5a38d296 100644
--- a/drivers/char/pcmcia/ipwireless/hardware.c
+++ b/drivers/tty/ipwireless/hardware.c
diff --git a/drivers/char/pcmcia/ipwireless/hardware.h b/drivers/tty/ipwireless/hardware.h
index 90a8590e43b0..90a8590e43b0 100644
--- a/drivers/char/pcmcia/ipwireless/hardware.h
+++ b/drivers/tty/ipwireless/hardware.h
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/tty/ipwireless/main.c
index 94b8eb4d691d..94b8eb4d691d 100644
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/tty/ipwireless/main.c
diff --git a/drivers/char/pcmcia/ipwireless/main.h b/drivers/tty/ipwireless/main.h
index f2cbb116bccb..f2cbb116bccb 100644
--- a/drivers/char/pcmcia/ipwireless/main.h
+++ b/drivers/tty/ipwireless/main.h
diff --git a/drivers/char/pcmcia/ipwireless/network.c b/drivers/tty/ipwireless/network.c
index f7daeea598e4..f7daeea598e4 100644
--- a/drivers/char/pcmcia/ipwireless/network.c
+++ b/drivers/tty/ipwireless/network.c
diff --git a/drivers/char/pcmcia/ipwireless/network.h b/drivers/tty/ipwireless/network.h
index 561f765b3334..561f765b3334 100644
--- a/drivers/char/pcmcia/ipwireless/network.h
+++ b/drivers/tty/ipwireless/network.h
diff --git a/drivers/char/pcmcia/ipwireless/setup_protocol.h b/drivers/tty/ipwireless/setup_protocol.h
index 9d6bcc77c73c..9d6bcc77c73c 100644
--- a/drivers/char/pcmcia/ipwireless/setup_protocol.h
+++ b/drivers/tty/ipwireless/setup_protocol.h
diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
index f5eb28b6cb0f..ef92869502a7 100644
--- a/drivers/char/pcmcia/ipwireless/tty.c
+++ b/drivers/tty/ipwireless/tty.c
@@ -395,7 +395,7 @@ static int set_control_lines(struct ipw_tty *tty, unsigned int set,
        return 0;
 }
-static int ipw_tiocmget(struct tty_struct *linux_tty, struct file *file)
+static int ipw_tiocmget(struct tty_struct *linux_tty)
 {
        struct ipw_tty *tty = linux_tty->driver_data;
        /* FIXME: Exactly how is the tty object locked here .. */
@@ -410,7 +410,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty, struct file *file)
 }
 static int
-ipw_tiocmset(struct tty_struct *linux_tty, struct file *file,
+ipw_tiocmset(struct tty_struct *linux_tty,
             unsigned int set, unsigned int clear)
 {
        struct ipw_tty *tty = linux_tty->driver_data;
@@ -425,7 +425,7 @@ ipw_tiocmset(struct tty_struct *linux_tty, struct file *file,
        return set_control_lines(tty, set, clear);
 }
-static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file,
+static int ipw_ioctl(struct tty_struct *linux_tty,
                     unsigned int cmd, unsigned long arg)
 {
        struct ipw_tty *tty = linux_tty->driver_data;
@@ -484,7 +484,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file,
                        return tty_perform_flush(linux_tty, arg);
                }
        }
-        return tty_mode_ioctl(linux_tty, file, cmd , arg);
+        return -ENOIOCTLCMD;
 }
 static int add_tty(int j,
diff --git a/drivers/char/pcmcia/ipwireless/tty.h b/drivers/tty/ipwireless/tty.h
index 747b2d637860..747b2d637860 100644
--- a/drivers/char/pcmcia/ipwireless/tty.h
+++ b/drivers/tty/ipwireless/tty.h
diff --git a/drivers/char/isicom.c b/drivers/tty/isicom.c
index c27e9d21fea9..db1cf9c328d8 100644
--- a/drivers/char/isicom.c
+++ b/drivers/tty/isicom.c
@@ -1065,7 +1065,7 @@ static int isicom_send_break(struct tty_struct *tty, int length)
        return 0;
 }
-static int isicom_tiocmget(struct tty_struct *tty, struct file *file)
+static int isicom_tiocmget(struct tty_struct *tty)
 {
        struct isi_port *port = tty->driver_data;
        /* just send the port status */
@@ -1082,8 +1082,8 @@ static int isicom_tiocmget(struct tty_struct *tty, struct file *file)
                ((status & ISI_RI ) ? TIOCM_RI  : 0);
 }
-static int isicom_tiocmset(struct tty_struct *tty, struct file *file,
+static int isicom_tiocmset(struct tty_struct *tty,
-        unsigned int set, unsigned int clear)
+                                        unsigned int set, unsigned int clear)
 {
        struct isi_port *port = tty->driver_data;
        unsigned long flags;
@@ -1167,7 +1167,7 @@ static int isicom_get_serial_info(struct isi_port *port,
        return 0;
 }
-static int isicom_ioctl(struct tty_struct *tty, struct file *filp,
+static int isicom_ioctl(struct tty_struct *tty,
        unsigned int cmd, unsigned long arg)
 {
        struct isi_port *port = tty->driver_data;
diff --git a/drivers/char/moxa.c b/drivers/tty/moxa.c
index 107b0bd58d19..35b0c38590e6 100644
--- a/drivers/char/moxa.c
+++ b/drivers/tty/moxa.c
@@ -199,8 +199,8 @@ static void moxa_set_termios(struct tty_struct *, struct ktermios *);
 static void moxa_stop(struct tty_struct *);
 static void moxa_start(struct tty_struct *);
 static void moxa_hangup(struct tty_struct *);
-static int moxa_tiocmget(struct tty_struct *tty, struct file *file);
+static int moxa_tiocmget(struct tty_struct *tty);
-static int moxa_tiocmset(struct tty_struct *tty, struct file *file,
+static int moxa_tiocmset(struct tty_struct *tty,
                         unsigned int set, unsigned int clear);
 static void moxa_poll(unsigned long);
 static void moxa_set_tty_param(struct tty_struct *, struct ktermios *);
@@ -287,7 +287,7 @@ static void moxa_low_water_check(void __iomem *ofsAddr)
 * TTY operations
 */
-static int moxa_ioctl(struct tty_struct *tty, struct file *file,
+static int moxa_ioctl(struct tty_struct *tty,
                      unsigned int cmd, unsigned long arg)
 {
        struct moxa_port *ch = tty->driver_data;
@@ -1257,7 +1257,7 @@ static int moxa_chars_in_buffer(struct tty_struct *tty)
        return chars;
 }
-static int moxa_tiocmget(struct tty_struct *tty, struct file *file)
+static int moxa_tiocmget(struct tty_struct *tty)
 {
        struct moxa_port *ch = tty->driver_data;
        int flag = 0, dtr, rts;
@@ -1277,7 +1277,7 @@ static int moxa_tiocmget(struct tty_struct *tty, struct file *file)
        return flag;
 }
-static int moxa_tiocmset(struct tty_struct *tty, struct file *file,
+static int moxa_tiocmset(struct tty_struct *tty,
                         unsigned int set, unsigned int clear)
 {
        struct moxa_port *ch;
diff --git a/drivers/char/moxa.h b/drivers/tty/moxa.h
index 87d16ce57be7..87d16ce57be7 100644
--- a/drivers/char/moxa.h
+++ b/drivers/tty/moxa.h
diff --git a/drivers/char/mxser.c b/drivers/tty/mxser.c
index dd9d75351cd6..d188f378684d 100644
--- a/drivers/char/mxser.c
+++ b/drivers/tty/mxser.c
@@ -1320,7 +1320,7 @@ static int mxser_get_lsr_info(struct mxser_port *info,
        return put_user(result, value);
 }
-static int mxser_tiocmget(struct tty_struct *tty, struct file *file)
+static int mxser_tiocmget(struct tty_struct *tty)
 {
        struct mxser_port *info = tty->driver_data;
        unsigned char control, status;
@@ -1347,7 +1347,7 @@ static int mxser_tiocmget(struct tty_struct *tty, struct file *file)
                    ((status & UART_MSR_CTS) ? TIOCM_CTS : 0);
 }
-static int mxser_tiocmset(struct tty_struct *tty, struct file *file,
+static int mxser_tiocmset(struct tty_struct *tty,
                unsigned int set, unsigned int clear)
 {
        struct mxser_port *info = tty->driver_data;
@@ -1655,7 +1655,7 @@ static int mxser_cflags_changed(struct mxser_port *info, unsigned long arg,
        return ret;
 }
-static int mxser_ioctl(struct tty_struct *tty, struct file *file,
+static int mxser_ioctl(struct tty_struct *tty,
                unsigned int cmd, unsigned long arg)
 {
        struct mxser_port *info = tty->driver_data;
diff --git a/drivers/char/mxser.h b/drivers/tty/mxser.h
index 41878a69203d..41878a69203d 100644
--- a/drivers/char/mxser.h
+++ b/drivers/tty/mxser.h
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index aa2e5d3eb01a..0d90be48463d 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -2649,13 +2649,13 @@ static void gsmtty_wait_until_sent(struct tty_struct *tty, int timeout)
           to do here */
 }
-static int gsmtty_tiocmget(struct tty_struct *tty, struct file *filp)
+static int gsmtty_tiocmget(struct tty_struct *tty)
 {
        struct gsm_dlci *dlci = tty->driver_data;
        return dlci->modem_rx;
 }
-static int gsmtty_tiocmset(struct tty_struct *tty, struct file *filp,
+static int gsmtty_tiocmset(struct tty_struct *tty,
        unsigned int set, unsigned int clear)
 {
        struct gsm_dlci *dlci = tty->driver_data;
@@ -2672,7 +2672,7 @@ static int gsmtty_tiocmset(struct tty_struct *tty, struct file *filp,
 }
-static int gsmtty_ioctl(struct tty_struct *tty, struct file *filp,
+static int gsmtty_ioctl(struct tty_struct *tty,
                        unsigned int cmd, unsigned long arg)
 {
        return -ENOIOCTLCMD;
diff --git a/drivers/char/nozomi.c b/drivers/tty/nozomi.c
index 294d03e8c61a..513ba12064ea 100644
--- a/drivers/char/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -1750,7 +1750,7 @@ static int ntty_write_room(struct tty_struct *tty)
 }
 /* Gets io control parameters */
-static int ntty_tiocmget(struct tty_struct *tty, struct file *file)
+static int ntty_tiocmget(struct tty_struct *tty)
 {
        const struct port *port = tty->driver_data;
        const struct ctrl_dl *ctrl_dl = &port->ctrl_dl;
@@ -1767,8 +1767,8 @@ static int ntty_tiocmget(struct tty_struct *tty, struct file *file)
 }
 /* Sets io controls parameters */
-static int ntty_tiocmset(struct tty_struct *tty, struct file *file,
+static int ntty_tiocmset(struct tty_struct *tty,
-        unsigned int set, unsigned int clear)
+                                        unsigned int set, unsigned int clear)
 {
        struct nozomi *dc = get_dc_by_tty(tty);
        unsigned long flags;
@@ -1824,7 +1824,7 @@ static int ntty_tiocgicount(struct tty_struct *tty,
        return 0;
 }
-static int ntty_ioctl(struct tty_struct *tty, struct file *file,
+static int ntty_ioctl(struct tty_struct *tty,
                      unsigned int cmd, unsigned long arg)
 {
        struct port *port = tty->driver_data;
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 923a48585501..c88029af84dd 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -334,7 +334,7 @@ free_mem_out:
        return -ENOMEM;
 }
-static int pty_bsd_ioctl(struct tty_struct *tty, struct file *file,
+static int pty_bsd_ioctl(struct tty_struct *tty,
                         unsigned int cmd, unsigned long arg)
 {
        switch (cmd) {
@@ -489,7 +489,7 @@ static struct ctl_table pty_root_table[] = {
 };
-static int pty_unix98_ioctl(struct tty_struct *tty, struct file *file,
+static int pty_unix98_ioctl(struct tty_struct *tty,
                            unsigned int cmd, unsigned long arg)
 {
        switch (cmd) {
diff --git a/drivers/char/rocket.c b/drivers/tty/rocket.c
index 3e4e73a0d7c1..3780da8ad12d 100644
--- a/drivers/char/rocket.c
+++ b/drivers/tty/rocket.c
@@ -1169,7 +1169,7 @@ static int sGetChanRI(CHANNEL_T * ChP)
 *  Returns the state of the serial modem control lines.  These next 2 functions 
 *  are the way kernel versions > 2.5 handle modem control lines rather than IOCTLs.
 */
-static int rp_tiocmget(struct tty_struct *tty, struct file *file)
+static int rp_tiocmget(struct tty_struct *tty)
 {
        struct r_port *info = tty->driver_data;
        unsigned int control, result, ChanStatus;
@@ -1189,8 +1189,8 @@ static int rp_tiocmget(struct tty_struct *tty, struct file *file)
 /* 
 *  Sets the modem control lines
 */
-static int rp_tiocmset(struct tty_struct *tty, struct file *file,
+static int rp_tiocmset(struct tty_struct *tty,
-                    unsigned int set, unsigned int clear)
+                                unsigned int set, unsigned int clear)
 {
        struct r_port *info = tty->driver_data;
@@ -1326,7 +1326,7 @@ static int get_version(struct r_port *info, struct rocket_version __user *retver
 }
 /*  IOCTL call handler into the driver */
-static int rp_ioctl(struct tty_struct *tty, struct file *file,
+static int rp_ioctl(struct tty_struct *tty,
                    unsigned int cmd, unsigned long arg)
 {
        struct r_port *info = tty->driver_data;
diff --git a/drivers/char/rocket.h b/drivers/tty/rocket.h
index ec863f35f1a9..ec863f35f1a9 100644
--- a/drivers/char/rocket.h
+++ b/drivers/tty/rocket.h
diff --git a/drivers/char/rocket_int.h b/drivers/tty/rocket_int.h
index 67e0f1e778a2..67e0f1e778a2 100644
--- a/drivers/char/rocket_int.h
+++ b/drivers/tty/rocket_int.h
diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c
index de0160e3f8c4..d5bfd41707e7 100644
--- a/drivers/tty/serial/68328serial.c
+++ b/drivers/tty/serial/68328serial.c
@@ -393,28 +393,6 @@ static void do_softint(struct work_struct *work)
 #endif   
 }
-/*
- * This routine is called from the scheduler tqueue when the interrupt
- * routine has signalled that a hangup has occurred.  The path of
- * hangup processing is:
- *
- *      serial interrupt routine -> (scheduler tqueue) ->
- *      do_serial_hangup() -> tty->hangup() -> rs_hangup()
- * 
- */
-static void do_serial_hangup(struct work_struct *work)
-{
-        struct m68k_serial      *info = container_of(work, struct m68k_serial, tqueue_hangup);
-        struct tty_struct       *tty;
-        
-        tty = info->tty;
-        if (!tty)
-                return;
-        tty_hangup(tty);
-}
 static int startup(struct m68k_serial * info)
 {
        m68328_uart *uart = &uart_addr[info->line];
@@ -967,7 +945,7 @@ static void send_break(struct m68k_serial * info, unsigned int duration)
        local_irq_restore(flags);
 }
-static int rs_ioctl(struct tty_struct *tty, struct file * file,
+static int rs_ioctl(struct tty_struct *tty,
                    unsigned int cmd, unsigned long arg)
 {
        struct m68k_serial * info = (struct m68k_serial *)tty->driver_data;
@@ -1347,7 +1325,6 @@ rs68328_init(void)
            info->count = 0;
            info->blocked_open = 0;
            INIT_WORK(&info->tqueue, do_softint);
-            INIT_WORK(&info->tqueue_hangup, do_serial_hangup);
            init_waitqueue_head(&info->open_wait);
            init_waitqueue_head(&info->close_wait);
            info->line = i;
diff --git a/drivers/tty/serial/68328serial.h b/drivers/tty/serial/68328serial.h
index 664ceb0a158c..8c9c3c0745db 100644
--- a/drivers/tty/serial/68328serial.h
+++ b/drivers/tty/serial/68328serial.h
@@ -159,7 +159,6 @@ struct m68k_serial {
        int                     xmit_tail;
        int                     xmit_cnt;
        struct work_struct      tqueue;
-        struct work_struct      tqueue_hangup;
        wait_queue_head_t       open_wait;
        wait_queue_head_t       close_wait;
 };
diff --git a/drivers/tty/serial/68360serial.c b/drivers/tty/serial/68360serial.c
index bc21eeae8fde..0a3e8787ed50 100644
--- a/drivers/tty/serial/68360serial.c
+++ b/drivers/tty/serial/68360serial.c
@@ -1240,7 +1240,7 @@ static int get_lsr_info(struct async_struct * info, unsigned int *value)
 }
 #endif
-static int rs_360_tiocmget(struct tty_struct *tty, struct file *file)
+static int rs_360_tiocmget(struct tty_struct *tty)
 {
        ser_info_t *info = (ser_info_t *)tty->driver_data;
        unsigned int result = 0;
@@ -1271,7 +1271,7 @@ static int rs_360_tiocmget(struct tty_struct *tty, struct file *file)
        return result;
 }
-static int rs_360_tiocmset(struct tty_struct *tty, struct file *file,
+static int rs_360_tiocmset(struct tty_struct *tty,
                           unsigned int set, unsigned int clear)
 {
 #ifdef modem_control
@@ -1405,7 +1405,7 @@ static int rs_360_get_icount(struct tty_struct *tty,
        return 0;
 }
-static int rs_360_ioctl(struct tty_struct *tty, struct file * file,
+static int rs_360_ioctl(struct tty_struct *tty,
                    unsigned int cmd, unsigned long arg)
 {
        int error;
diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250.c
index 3975df6f7fdb..b3b881bc4712 100644
--- a/drivers/tty/serial/8250.c
+++ b/drivers/tty/serial/8250.c
@@ -954,6 +954,23 @@ static int broken_efr(struct uart_8250_port *up)
        return 0;
 }
+static inline int ns16550a_goto_highspeed(struct uart_8250_port *up)
+{
+        unsigned char status;
+        status = serial_in(up, 0x04); /* EXCR2 */
+#define PRESL(x) ((x) & 0x30)
+        if (PRESL(status) == 0x10) {
+                /* already in high speed mode */
+                return 0;
+        } else {
+                status &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
+                status |= 0x10;  /* 1.625 divisor for baud_base --> 921600 */
+                serial_outp(up, 0x04, status);
+        }
+        return 1;
+}
 /*
 * We know that the chip has FIFOs.  Does it have an EFR?  The
 * EFR is located in the same register position as the IIR and
@@ -1025,12 +1042,8 @@ static void autoconfig_16550a(struct uart_8250_port *up)
                        quot = serial_dl_read(up);
                        quot <<= 3;
-                        status1 = serial_in(up, 0x04); /* EXCR2 */
+                        if (ns16550a_goto_highspeed(up))
-                        status1 &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
+                                serial_dl_write(up, quot);
-                        status1 |= 0x10;  /* 1.625 divisor for baud_base --> 921600 */
-                        serial_outp(up, 0x04, status1);
-                        serial_dl_write(up, quot);
                        serial_outp(up, UART_LCR, 0);
@@ -3025,17 +3038,13 @@ void serial8250_resume_port(int line)
        struct uart_8250_port *up = &serial8250_ports[line];
        if (up->capabilities & UART_NATSEMI) {
-                unsigned char tmp;
                /* Ensure it's still in high speed mode */
                serial_outp(up, UART_LCR, 0xE0);
-                tmp = serial_in(up, 0x04); /* EXCR2 */
+                ns16550a_goto_highspeed(up);
-                tmp &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
-                tmp |= 0x10;  /* 1.625 divisor for baud_base --> 921600 */
-                serial_outp(up, 0x04, tmp);
                serial_outp(up, UART_LCR, 0);
+                up->port.uartclk = 921600*16;
        }
        uart_resume_port(&serial8250_reg, &up->port);
 }
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 2b8334601c8b..90d939a4ee5d 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1588,12 +1588,25 @@ config SERIAL_IFX6X60
          Support for the IFX6x60 modem devices on Intel MID platforms.
 config SERIAL_PCH_UART
-        tristate "Intel EG20T PCH UART"
+        tristate "Intel EG20T PCH UART/OKI SEMICONDUCTOR ML7213 IOH"
-        depends on PCI && DMADEVICES
+        depends on PCI
        select SERIAL_CORE
-        select PCH_DMA
        help
          This driver is for PCH(Platform controller Hub) UART of Intel EG20T
          which is an IOH(Input/Output Hub) for x86 embedded processor.
          Enabling PCH_DMA, this PCH UART works as DMA mode.
+          This driver also can be used for OKI SEMICONDUCTOR ML7213 IOH(Input/
+          Output Hub) which is for IVI(In-Vehicle Infotainment) use.
+          ML7213 is companion chip for Intel Atom E6xx series.
+          ML7213 is completely compatible for Intel EG20T PCH.
+config SERIAL_MSM_SMD
+        bool "Enable tty device interface for some SMD ports"
+        default n
+        depends on MSM_SMD
+        help
+          Enables userspace clients to read and write to some streaming SMD
+          ports via tty device interface for MSM chipset.
 endmenu
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index 8ea92e9c73b0..0c6aefb55acf 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -92,3 +92,4 @@ obj-$(CONFIG_SERIAL_MRST_MAX3110)	+= mrst_max3110.o
 obj-$(CONFIG_SERIAL_MFD_HSU)    += mfd.o
 obj-$(CONFIG_SERIAL_IFX6X60)    += ifx6x60.o
 obj-$(CONFIG_SERIAL_PCH_UART)   += pch_uart.o
+obj-$(CONFIG_SERIAL_MSM_SMD)    += msm_smd_tty.o
diff --git a/drivers/tty/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c
index f9b49b5ff5e1..8f014bb916b7 100644
--- a/drivers/tty/serial/altera_jtaguart.c
+++ b/drivers/tty/serial/altera_jtaguart.c
@@ -305,28 +305,6 @@ static struct altera_jtaguart altera_jtaguart_ports[ALTERA_JTAGUART_MAXPORTS];
 #if defined(CONFIG_SERIAL_ALTERA_JTAGUART_CONSOLE)
-int __init early_altera_jtaguart_setup(struct altera_jtaguart_platform_uart
-                                       *platp)
-{
-        struct uart_port *port;
-        int i;
-        for (i = 0; i < ALTERA_JTAGUART_MAXPORTS && platp[i].mapbase; i++) {
-                port = &altera_jtaguart_ports[i].port;
-                port->line = i;
-                port->type = PORT_ALTERA_JTAGUART;
-                port->mapbase = platp[i].mapbase;
-                port->membase = ioremap(port->mapbase, ALTERA_JTAGUART_SIZE);
-                port->iotype = SERIAL_IO_MEM;
-                port->irq = platp[i].irq;
-                port->flags = ASYNC_BOOT_AUTOCONF;
-                port->ops = &altera_jtaguart_ops;
-        }
-        return 0;
-}
 #if defined(CONFIG_SERIAL_ALTERA_JTAGUART_CONSOLE_BYPASS)
 static void altera_jtaguart_console_putc(struct console *co, const char c)
 {
@@ -384,7 +362,7 @@ static int __init altera_jtaguart_console_setup(struct console *co,
        if (co->index < 0 || co->index >= ALTERA_JTAGUART_MAXPORTS)
                return -EINVAL;
        port = &altera_jtaguart_ports[co->index].port;
-        if (port->membase == 0)
+        if (port->membase == NULL)
                return -ENODEV;
        return 0;
 }
@@ -431,22 +409,45 @@ static int __devinit altera_jtaguart_probe(struct platform_device *pdev)
 {
        struct altera_jtaguart_platform_uart *platp = pdev->dev.platform_data;
        struct uart_port *port;
-        int i;
+        struct resource *res_irq, *res_mem;
+        int i = pdev->id;
-        for (i = 0; i < ALTERA_JTAGUART_MAXPORTS && platp[i].mapbase; i++) {
+        /* -1 emphasizes that the platform must have one port, no .N suffix */
-                port = &altera_jtaguart_ports[i].port;
+        if (i == -1)
+                i = 0;
-                port->line = i;
+        if (i >= ALTERA_JTAGUART_MAXPORTS)
-                port->type = PORT_ALTERA_JTAGUART;
+                return -EINVAL;
-                port->mapbase = platp[i].mapbase;
-                port->membase = ioremap(port->mapbase, ALTERA_JTAGUART_SIZE);
-                port->iotype = SERIAL_IO_MEM;
-                port->irq = platp[i].irq;
-                port->ops = &altera_jtaguart_ops;
-                port->flags = ASYNC_BOOT_AUTOCONF;
-                uart_add_one_port(&altera_jtaguart_driver, port);
+        port = &altera_jtaguart_ports[i].port;
-        }
+        res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (res_mem)
+                port->mapbase = res_mem->start;
+        else if (platp)
+                port->mapbase = platp->mapbase;
+        else
+                return -ENODEV;
+        res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (res_irq)
+                port->irq = res_irq->start;
+        else if (platp)
+                port->irq = platp->irq;
+        else
+                return -ENODEV;
+        port->membase = ioremap(port->mapbase, ALTERA_JTAGUART_SIZE);
+        if (!port->membase)
+                return -ENOMEM;
+        port->line = i;
+        port->type = PORT_ALTERA_JTAGUART;
+        port->iotype = SERIAL_IO_MEM;
+        port->ops = &altera_jtaguart_ops;
+        port->flags = UPF_BOOT_AUTOCONF;
+        uart_add_one_port(&altera_jtaguart_driver, port);
        return 0;
 }
@@ -454,13 +455,13 @@ static int __devinit altera_jtaguart_probe(struct platform_device *pdev)
 static int __devexit altera_jtaguart_remove(struct platform_device *pdev)
 {
        struct uart_port *port;
-        int i;
+        int i = pdev->id;
-        for (i = 0; i < ALTERA_JTAGUART_MAXPORTS; i++) {
+        if (i == -1)
-                port = &altera_jtaguart_ports[i].port;
+                i = 0;
-                if (port)
-                        uart_remove_one_port(&altera_jtaguart_driver, port);
+        port = &altera_jtaguart_ports[i].port;
-        }
+        uart_remove_one_port(&altera_jtaguart_driver, port);
        return 0;
 }
diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
index 721216292a50..3a573528555e 100644
--- a/drivers/tty/serial/altera_uart.c
+++ b/drivers/tty/serial/altera_uart.c
@@ -86,16 +86,12 @@ struct altera_uart {
 static u32 altera_uart_readl(struct uart_port *port, int reg)
 {
-        struct altera_uart_platform_uart *platp = port->private_data;
+        return readl(port->membase + (reg << port->regshift));
-        return readl(port->membase + (reg << platp->bus_shift));
 }
 static void altera_uart_writel(struct uart_port *port, u32 dat, int reg)
 {
-        struct altera_uart_platform_uart *platp = port->private_data;
+        writel(dat, port->membase + (reg << port->regshift));
-        writel(dat, port->membase + (reg << platp->bus_shift));
 }
 static unsigned int altera_uart_tx_empty(struct uart_port *port)
@@ -546,13 +542,17 @@ static int __devinit altera_uart_probe(struct platform_device *pdev)
        if (!port->membase)
                return -ENOMEM;
+        if (platp)
+                port->regshift = platp->bus_shift;
+        else
+                port->regshift = 0;
        port->line = i;
        port->type = PORT_ALTERA_UART;
        port->iotype = SERIAL_IO_MEM;
        port->uartclk = platp->uartclk;
        port->ops = &altera_uart_ops;
        port->flags = UPF_BOOT_AUTOCONF;
-        port->private_data = platp;
        uart_add_one_port(&altera_uart_driver, port);
@@ -561,9 +561,15 @@ static int __devinit altera_uart_probe(struct platform_device *pdev)
 static int __devexit altera_uart_remove(struct platform_device *pdev)
 {
-        struct uart_port *port = &altera_uart_ports[pdev->id].port;
+        struct uart_port *port;
+        int i = pdev->id;
+        if (i == -1)
+                i = 0;
+        port = &altera_uart_ports[i].port;
        uart_remove_one_port(&altera_uart_driver, port);
        return 0;
 }
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 2a1d52fb4936..f119d1761106 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1240,6 +1240,21 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
        spin_unlock_irqrestore(&port->lock, flags);
 }
+static void atmel_set_ldisc(struct uart_port *port, int new)
+{
+        int line = port->line;
+        if (line >= port->state->port.tty->driver->num)
+                return;
+        if (port->state->port.tty->ldisc->ops->num == N_PPS) {
+                port->flags |= UPF_HARDPPS_CD;
+                atmel_enable_ms(port);
+        } else {
+                port->flags &= ~UPF_HARDPPS_CD;
+        }
+}
 /*
 * Return string describing the specified port
 */
@@ -1380,6 +1395,7 @@ static struct uart_ops atmel_pops = {
        .shutdown       = atmel_shutdown,
        .flush_buffer   = atmel_flush_buffer,
        .set_termios    = atmel_set_termios,
+        .set_ldisc      = atmel_set_ldisc,
        .type           = atmel_type,
        .release_port   = atmel_release_port,
        .request_port   = atmel_request_port,
diff --git a/drivers/tty/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c
index e95c524d9d18..c3ec0a61d859 100644
--- a/drivers/tty/serial/bfin_sport_uart.c
+++ b/drivers/tty/serial/bfin_sport_uart.c
@@ -788,7 +788,7 @@ static int __devinit sport_uart_probe(struct platform_device *pdev)
                sport->port.mapbase = res->start;
                sport->port.irq = platform_get_irq(pdev, 0);
-                if (sport->port.irq < 0) {
+                if ((int)sport->port.irq < 0) {
                        dev_err(&pdev->dev, "No sport RX/TX IRQ specified\n");
                        ret = -ENOENT;
                        goto out_error_unmap;
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
index bcc31f2140ac..225123b37f19 100644
--- a/drivers/tty/serial/crisv10.c
+++ b/drivers/tty/serial/crisv10.c
@@ -3581,8 +3581,7 @@ rs_break(struct tty_struct *tty, int break_state)
 }
 static int
-rs_tiocmset(struct tty_struct *tty, struct file *file,
+rs_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear)
-                unsigned int set, unsigned int clear)
 {
        struct e100_serial *info = (struct e100_serial *)tty->driver_data;
        unsigned long flags;
@@ -3614,7 +3613,7 @@ rs_tiocmset(struct tty_struct *tty, struct file *file,
 }
 static int
-rs_tiocmget(struct tty_struct *tty, struct file *file)
+rs_tiocmget(struct tty_struct *tty)
 {
        struct e100_serial *info = (struct e100_serial *)tty->driver_data;
        unsigned int result;
@@ -3648,7 +3647,7 @@ rs_tiocmget(struct tty_struct *tty, struct file *file)
 static int
-rs_ioctl(struct tty_struct *tty, struct file * file,
+rs_ioctl(struct tty_struct *tty,
         unsigned int cmd, unsigned long arg)
 {
        struct e100_serial * info = (struct e100_serial *)tty->driver_data;
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index ab93763862d5..8ee5a41d340d 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -8,7 +8,7 @@
 *                    Jan Dumon <j.dumon@option.com>
 *
 * Copyright (C) 2009, 2010 Intel Corp
- * Russ Gorby <richardx.r.gorby@intel.com>
+ * Russ Gorby <russ.gorby@intel.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
@@ -67,6 +67,7 @@
 #define IFX_SPI_MORE_MASK               0x10
 #define IFX_SPI_MORE_BIT                12      /* bit position in u16 */
 #define IFX_SPI_CTS_BIT                 13      /* bit position in u16 */
+#define IFX_SPI_MODE                    SPI_MODE_1
 #define IFX_SPI_TTY_ID                  0
 #define IFX_SPI_TIMEOUT_SEC             2
 #define IFX_SPI_HEADER_0                (-1)
@@ -76,7 +77,7 @@
 static void ifx_spi_handle_srdy(struct ifx_spi_device *ifx_dev);
 /* local variables */
-static int spi_b16 = 1;                 /* 8 or 16 bit word length */
+static int spi_bpw = 16;                /* 8, 16 or 32 bit word length */
 static struct tty_driver *tty_drv;
 static struct ifx_spi_device *saved_ifx_dev;
 static struct lock_class_key ifx_spi_key;
@@ -244,7 +245,7 @@ static void ifx_spi_timeout(unsigned long arg)
 *      Map the signal state into Linux modem flags and report the value
 *      in Linux terms
 */
-static int ifx_spi_tiocmget(struct tty_struct *tty, struct file *filp)
+static int ifx_spi_tiocmget(struct tty_struct *tty)
 {
        unsigned int value;
        struct ifx_spi_device *ifx_dev = tty->driver_data;
@@ -262,7 +263,6 @@ static int ifx_spi_tiocmget(struct tty_struct *tty, struct file *filp)
 /**
 *      ifx_spi_tiocmset        -       set modem bits
 *      @tty: the tty structure
- *      @filp: file handle issuing the request
 *      @set: bits to set
 *      @clear: bits to clear
 *
@@ -271,7 +271,7 @@ static int ifx_spi_tiocmget(struct tty_struct *tty, struct file *filp)
 *
 *      FIXME: do we need to kick the tranfers when we do this ?
 */
-static int ifx_spi_tiocmset(struct tty_struct *tty, struct file *filp,
+static int ifx_spi_tiocmset(struct tty_struct *tty,
                            unsigned int set, unsigned int clear)
 {
        struct ifx_spi_device *ifx_dev = tty->driver_data;
@@ -722,9 +722,9 @@ static void ifx_spi_io(unsigned long data)
                /* note len is BYTES, not transfers */
                ifx_dev->spi_xfer.len = IFX_SPI_TRANSFER_SIZE;
                ifx_dev->spi_xfer.cs_change = 0;
-                ifx_dev->spi_xfer.speed_hz = 12500000;
+                ifx_dev->spi_xfer.speed_hz = ifx_dev->spi_dev->max_speed_hz;
                /* ifx_dev->spi_xfer.speed_hz = 390625; */
-                ifx_dev->spi_xfer.bits_per_word = spi_b16 ? 16 : 8;
+                ifx_dev->spi_xfer.bits_per_word = spi_bpw;
                ifx_dev->spi_xfer.tx_buf = ifx_dev->tx_buffer;
                ifx_dev->spi_xfer.rx_buf = ifx_dev->rx_buffer;
@@ -732,7 +732,7 @@ static void ifx_spi_io(unsigned long data)
                /*
                 * setup dma pointers
                 */
-                if (ifx_dev->is_6160) {
+                if (ifx_dev->use_dma) {
                        ifx_dev->spi_msg.is_dma_mapped = 1;
                        ifx_dev->tx_dma = ifx_dev->tx_bus;
                        ifx_dev->rx_dma = ifx_dev->rx_bus;
@@ -798,8 +798,8 @@ static int ifx_spi_create_port(struct ifx_spi_device *ifx_dev)
                goto error_ret;
        }
-        pport->ops = &ifx_tty_port_ops;
        tty_port_init(pport);
+        pport->ops = &ifx_tty_port_ops;
        ifx_dev->minor = IFX_SPI_TTY_ID;
        ifx_dev->tty_dev = tty_register_device(tty_drv, ifx_dev->minor,
                                               &ifx_dev->spi_dev->dev);
@@ -960,7 +960,7 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
 {
        int ret;
        int srdy;
-        struct ifx_modem_platform_data *pl_data = NULL;
+        struct ifx_modem_platform_data *pl_data;
        struct ifx_spi_device *ifx_dev;
        if (saved_ifx_dev) {
@@ -968,6 +968,12 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
                return -ENODEV;
        }
+        pl_data = (struct ifx_modem_platform_data *)spi->dev.platform_data;
+        if (!pl_data) {
+                dev_err(&spi->dev, "missing platform data!");
+                return -ENODEV;
+        }
        /* initialize structure to hold our device variables */
        ifx_dev = kzalloc(sizeof(struct ifx_spi_device), GFP_KERNEL);
        if (!ifx_dev) {
@@ -983,14 +989,25 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
        init_timer(&ifx_dev->spi_timer);
        ifx_dev->spi_timer.function = ifx_spi_timeout;
        ifx_dev->spi_timer.data = (unsigned long)ifx_dev;
-        ifx_dev->is_6160 = pl_data->is_6160;
+        ifx_dev->modem = pl_data->modem_type;
+        ifx_dev->use_dma = pl_data->use_dma;
+        ifx_dev->max_hz = pl_data->max_hz;
+        /* initialize spi mode, etc */
+        spi->max_speed_hz = ifx_dev->max_hz;
+        spi->mode = IFX_SPI_MODE | (SPI_LOOP & spi->mode);
+        spi->bits_per_word = spi_bpw;
+        ret = spi_setup(spi);
+        if (ret) {
+                dev_err(&spi->dev, "SPI setup wasn't successful %d", ret);
+                return -ENODEV;
+        }
        /* ensure SPI protocol flags are initialized to enable transfer */
        ifx_dev->spi_more = 0;
        ifx_dev->spi_slave_cts = 0;
        /*initialize transfer and dma buffers */
-        ifx_dev->tx_buffer = dma_alloc_coherent(&ifx_dev->spi_dev->dev,
+        ifx_dev->tx_buffer = dma_alloc_coherent(ifx_dev->spi_dev->dev.parent,
                                IFX_SPI_TRANSFER_SIZE,
                                &ifx_dev->tx_bus,
                                GFP_KERNEL);
@@ -999,7 +1016,7 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
                ret = -ENOMEM;
                goto error_ret;
        }
-        ifx_dev->rx_buffer = dma_alloc_coherent(&ifx_dev->spi_dev->dev,
+        ifx_dev->rx_buffer = dma_alloc_coherent(ifx_dev->spi_dev->dev.parent,
                                IFX_SPI_TRANSFER_SIZE,
                                &ifx_dev->rx_bus,
                                GFP_KERNEL);
@@ -1025,18 +1042,11 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
                goto error_ret;
        }
-        pl_data = (struct ifx_modem_platform_data *)spi->dev.platform_data;
+        ifx_dev->gpio.reset = pl_data->rst_pmu;
-        if (pl_data) {
+        ifx_dev->gpio.po = pl_data->pwr_on;
-                ifx_dev->gpio.reset = pl_data->rst_pmu;
+        ifx_dev->gpio.mrdy = pl_data->mrdy;
-                ifx_dev->gpio.po = pl_data->pwr_on;
+        ifx_dev->gpio.srdy = pl_data->srdy;
-                ifx_dev->gpio.mrdy = pl_data->mrdy;
+        ifx_dev->gpio.reset_out = pl_data->rst_out;
-                ifx_dev->gpio.srdy = pl_data->srdy;
-                ifx_dev->gpio.reset_out = pl_data->rst_out;
-        } else {
-                dev_err(&spi->dev, "missing platform data!");
-                ret = -ENODEV;
-                goto error_ret;
-        }
        dev_info(&spi->dev, "gpios %d, %d, %d, %d, %d",
                 ifx_dev->gpio.reset, ifx_dev->gpio.po, ifx_dev->gpio.mrdy,
@@ -1322,9 +1332,9 @@ static const struct spi_device_id ifx_id_table[] = {
 MODULE_DEVICE_TABLE(spi, ifx_id_table);
 /* spi operations */
-static const struct spi_driver ifx_spi_driver_6160 = {
+static const struct spi_driver ifx_spi_driver = {
        .driver = {
-                .name = "ifx6160",
+                .name = DRVNAME,
                .bus = &spi_bus_type,
                .pm = &ifx_spi_pm,
                .owner = THIS_MODULE},
@@ -1346,7 +1356,7 @@ static void __exit ifx_spi_exit(void)
 {
        /* unregister */
        tty_unregister_driver(tty_drv);
-        spi_unregister_driver((void *)&ifx_spi_driver_6160);
+        spi_unregister_driver((void *)&ifx_spi_driver);
 }
 /**
@@ -1388,7 +1398,7 @@ static int __init ifx_spi_init(void)
                return result;
        }
-        result = spi_register_driver((void *)&ifx_spi_driver_6160);
+        result = spi_register_driver((void *)&ifx_spi_driver);
        if (result) {
                pr_err("%s: spi_register_driver failed(%d)",
                        DRVNAME, result);
diff --git a/drivers/tty/serial/ifx6x60.h b/drivers/tty/serial/ifx6x60.h
index deb7b8d977dc..e8464baf9e75 100644
--- a/drivers/tty/serial/ifx6x60.h
+++ b/drivers/tty/serial/ifx6x60.h
@@ -29,8 +29,6 @@
 #define DRVNAME                         "ifx6x60"
 #define TTYNAME                         "ttyIFX"
-/* #define IFX_THROTTLE_CODE */
 #define IFX_SPI_MAX_MINORS              1
 #define IFX_SPI_TRANSFER_SIZE           2048
 #define IFX_SPI_FIFO_SIZE               4096
@@ -88,7 +86,9 @@ struct ifx_spi_device {
        dma_addr_t rx_dma;
        dma_addr_t tx_dma;
-        int is_6160;                            /* Modem type */
+        int modem;              /* Modem type */
+        int use_dma;            /* provide dma-able addrs in SPI msg */
+        long max_hz;            /* max SPI frequency */
        spinlock_t write_lock;
        int write_pending;
diff --git a/drivers/tty/serial/mfd.c b/drivers/tty/serial/mfd.c
index d40010a22ecd..c111f36f5d21 100644
--- a/drivers/tty/serial/mfd.c
+++ b/drivers/tty/serial/mfd.c
@@ -16,9 +16,7 @@
 *    2/3 chan to port 1, 4/5 chan to port 3. Even number chans
 *    are used for RX, odd chans for TX
 *
- * 2. In A0 stepping, UART will not support TX half empty flag
+ * 2. The RI/DSR/DCD/DTR are not pinned out, DCD & DSR are always
- *
- * 3. The RI/DSR/DCD/DTR are not pinned out, DCD & DSR are always
 *    asserted, only when the HW is reset the DDCD and DDSR will
 *    be triggered
 */
@@ -41,8 +39,6 @@
 #include <linux/io.h>
 #include <linux/debugfs.h>
-#define  MFD_HSU_A0_STEPPING    1
 #define HSU_DMA_BUF_SIZE        2048
 #define chan_readl(chan, offset)        readl(chan->reg + offset)
@@ -51,7 +47,10 @@
 #define mfd_readl(obj, offset)          readl(obj->reg + offset)
 #define mfd_writel(obj, offset, val)    writel(val, obj->reg + offset)
-#define HSU_DMA_TIMEOUT_CHECK_FREQ      (HZ/10)
+static int hsu_dma_enable;
+module_param(hsu_dma_enable, int, 0);
+MODULE_PARM_DESC(hsu_dma_enable, "It is a bitmap to set working mode, if \
+bit[x] is 1, then port[x] will work in DMA mode, otherwise in PIO mode.");
 struct hsu_dma_buffer {
        u8              *buf;
@@ -65,7 +64,6 @@ struct hsu_dma_chan {
        enum dma_data_direction dirt;
        struct uart_hsu_port    *uport;
        void __iomem            *reg;
-        struct timer_list       rx_timer; /* only needed by RX channel */
 };
 struct uart_hsu_port {
@@ -355,8 +353,6 @@ void hsu_dma_start_rx_chan(struct hsu_dma_chan *rxc, struct hsu_dma_buffer *dbuf
                                         | (0x1 << 24)  /* timeout bit, see HSU Errata 1 */
                                         );
        chan_writel(rxc, HSU_CH_CR, 0x3);
-        mod_timer(&rxc->rx_timer, jiffies + HSU_DMA_TIMEOUT_CHECK_FREQ);
 }
 /* Protected by spin_lock_irqsave(port->lock) */
@@ -420,7 +416,6 @@ void hsu_dma_rx(struct uart_hsu_port *up, u32 int_sts)
                chan_writel(chan, HSU_CH_CR, 0x3);
                return;
        }
-        del_timer(&chan->rx_timer);
        dma_sync_single_for_cpu(port->dev, dbuf->dma_addr,
                        dbuf->dma_size, DMA_FROM_DEVICE);
@@ -448,8 +443,6 @@ void hsu_dma_rx(struct uart_hsu_port *up, u32 int_sts)
        tty_flip_buffer_push(tty);
        chan_writel(chan, HSU_CH_CR, 0x3);
-        chan->rx_timer.expires = jiffies + HSU_DMA_TIMEOUT_CHECK_FREQ;
-        add_timer(&chan->rx_timer);
 }
@@ -551,16 +544,9 @@ static void transmit_chars(struct uart_hsu_port *up)
                return;
        }
-#ifndef MFD_HSU_A0_STEPPING
+        /* The IRQ is for TX FIFO half-empty */
        count = up->port.fifosize / 2;
-#else
-        /*
-         * A0 only supports fully empty IRQ, and the first char written
-         * into it won't clear the EMPT bit, so we may need be cautious
-         * by useing a shorter buffer
-         */
-        count = up->port.fifosize - 4;
-#endif
        do {
                serial_out(up, UART_TX, xmit->buf[xmit->tail]);
                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
@@ -769,9 +755,8 @@ static void serial_hsu_break_ctl(struct uart_port *port, int break_state)
 /*
 * What special to do:
 * 1. chose the 64B fifo mode
- * 2. make sure not to select half empty mode for A0 stepping
+ * 2. start dma or pio depends on configuration
- * 3. start dma or pio depends on configuration
+ * 3. we only allocate dma memory when needed
- * 4. we only allocate dma memory when needed
 */
 static int serial_hsu_startup(struct uart_port *port)
 {
@@ -870,8 +855,6 @@ static void serial_hsu_shutdown(struct uart_port *port)
                container_of(port, struct uart_hsu_port, port);
        unsigned long flags;
-        del_timer_sync(&up->rxc->rx_timer);
        /* Disable interrupts from this port */
        up->ier = 0;
        serial_out(up, UART_IER, 0);
@@ -977,10 +960,6 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios,
                fcr = UART_FCR_ENABLE_FIFO | UART_FCR_HSU_64_32B;
        fcr |= UART_FCR_HSU_64B_FIFO;
-#ifdef MFD_HSU_A0_STEPPING
-        /* A0 doesn't support half empty IRQ */
-        fcr |= UART_FCR_FULL_EMPT_TXI;
-#endif
        /*
         * Ok, we're now changing the port state.  Do it with
@@ -1343,28 +1322,6 @@ err_disable:
        return ret;
 }
-static void hsu_dma_rx_timeout(unsigned long data)
-{
-        struct hsu_dma_chan *chan = (void *)data;
-        struct uart_hsu_port *up = chan->uport;
-        struct hsu_dma_buffer *dbuf = &up->rxbuf;
-        int count = 0;
-        unsigned long flags;
-        spin_lock_irqsave(&up->port.lock, flags);
-        count = chan_readl(chan, HSU_CH_D0SAR) - dbuf->dma_addr;
-        if (!count) {
-                mod_timer(&chan->rx_timer, jiffies + HSU_DMA_TIMEOUT_CHECK_FREQ);
-                goto exit;
-        }
-        hsu_dma_rx(up, 0);
-exit:
-        spin_unlock_irqrestore(&up->port.lock, flags);
-}
 static void hsu_global_init(void)
 {
        struct hsu_port *hsu;
@@ -1415,6 +1372,12 @@ static void hsu_global_init(void)
                serial_hsu_ports[i] = uport;
                uport->index = i;
+                if (hsu_dma_enable & (1<<i))
+                        uport->use_dma = 1;
+                else
+                        uport->use_dma = 0;
                uport++;
        }
@@ -1427,12 +1390,6 @@ static void hsu_global_init(void)
                dchan->reg = hsu->reg + HSU_DMA_CHANS_REG_OFFSET +
                                i * HSU_DMA_CHANS_REG_LENGTH;
-                /* Work around for RX */
-                if (dchan->dirt == DMA_FROM_DEVICE) {
-                        init_timer(&dchan->rx_timer);
-                        dchan->rx_timer.function = hsu_dma_rx_timeout;
-                        dchan->rx_timer.data = (unsigned long)dchan;
-                }
                dchan++;
        }
diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c
index b62857bf2fdb..37e13c3d91d9 100644
--- a/drivers/tty/serial/mrst_max3110.c
+++ b/drivers/tty/serial/mrst_max3110.c
@@ -51,7 +51,7 @@
 struct uart_max3110 {
        struct uart_port port;
        struct spi_device *spi;
-        char name[24];
+        char name[SPI_NAME_SIZE];
        wait_queue_head_t wq;
        struct task_struct *main_thread;
diff --git a/drivers/tty/serial/msm_smd_tty.c b/drivers/tty/serial/msm_smd_tty.c
new file mode 100644
index 000000000000..beeff1e86093
--- /dev/null
+++ b/drivers/tty/serial/msm_smd_tty.c
@@ -0,0 +1,236 @@
+/* drivers/tty/serial/msm_smd_tty.c
+ *
+ * Copyright (C) 2007 Google, Inc.
+ * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+ * Author: Brian Swetland <swetland@google.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/cdev.h>
+#include <linux/device.h>
+#include <linux/wait.h>
+#include <linux/tty.h>
+#include <linux/tty_driver.h>
+#include <linux/tty_flip.h>
+#include <mach/msm_smd.h>
+#define MAX_SMD_TTYS 32
+struct smd_tty_info {
+        struct tty_port port;
+        smd_channel_t *ch;
+};
+struct smd_tty_channel_desc {
+        int id;
+        const char *name;
+};
+static struct smd_tty_info smd_tty[MAX_SMD_TTYS];
+static const struct smd_tty_channel_desc smd_default_tty_channels[] = {
+        { .id = 0, .name = "SMD_DS" },
+        { .id = 27, .name = "SMD_GPSNMEA" },
+};
+static const struct smd_tty_channel_desc *smd_tty_channels =
+                smd_default_tty_channels;
+static int smd_tty_channels_len = ARRAY_SIZE(smd_default_tty_channels);
+static void smd_tty_notify(void *priv, unsigned event)
+{
+        unsigned char *ptr;
+        int avail;
+        struct smd_tty_info *info = priv;
+        struct tty_struct *tty;
+        if (event != SMD_EVENT_DATA)
+                return;
+        tty = tty_port_tty_get(&info->port);
+        if (!tty)
+                return;
+        for (;;) {
+                if (test_bit(TTY_THROTTLED, &tty->flags))
+                        break;
+                avail = smd_read_avail(info->ch);
+                if (avail == 0)
+                        break;
+                avail = tty_prepare_flip_string(tty, &ptr, avail);
+                if (smd_read(info->ch, ptr, avail) != avail) {
+                        /* shouldn't be possible since we're in interrupt
+                        ** context here and nobody else could 'steal' our
+                        ** characters.
+                        */
+                        pr_err("OOPS - smd_tty_buffer mismatch?!");
+                }
+                tty_flip_buffer_push(tty);
+        }
+        /* XXX only when writable and necessary */
+        tty_wakeup(tty);
+        tty_kref_put(tty);
+}
+static int smd_tty_port_activate(struct tty_port *tport, struct tty_struct *tty)
+{
+        int i, res = 0;
+        int n = tty->index;
+        const char *name = NULL;
+        struct smd_tty_info *info = smd_tty + n;
+        for (i = 0; i < smd_tty_channels_len; i++) {
+                if (smd_tty_channels[i].id == n) {
+                        name = smd_tty_channels[i].name;
+                        break;
+                }
+        }
+        if (!name)
+                return -ENODEV;
+        if (info->ch)
+                smd_kick(info->ch);
+        else
+                res = smd_open(name, &info->ch, info, smd_tty_notify);
+        if (!res)
+                tty->driver_data = info;
+        return res;
+}
+static void smd_tty_port_shutdown(struct tty_port *tport)
+{
+        struct smd_tty_info *info;
+        struct tty_struct *tty = tty_port_tty_get(tport);
+        info = tty->driver_data;
+        if (info->ch) {
+                smd_close(info->ch);
+                info->ch = 0;
+        }
+        tty->driver_data = 0;
+        tty_kref_put(tty);
+}
+static int smd_tty_open(struct tty_struct *tty, struct file *f)
+{
+        struct smd_tty_info *info = smd_tty + tty->index;
+        return tty_port_open(&info->port, tty, f);
+}
+static void smd_tty_close(struct tty_struct *tty, struct file *f)
+{
+        struct smd_tty_info *info = tty->driver_data;
+        tty_port_close(&info->port, tty, f);
+}
+static int smd_tty_write(struct tty_struct *tty,
+                         const unsigned char *buf, int len)
+{
+        struct smd_tty_info *info = tty->driver_data;
+        int avail;
+        /* if we're writing to a packet channel we will
+        ** never be able to write more data than there
+        ** is currently space for
+        */
+        avail = smd_write_avail(info->ch);
+        if (len > avail)
+                len = avail;
+        return smd_write(info->ch, buf, len);
+}
+static int smd_tty_write_room(struct tty_struct *tty)
+{
+        struct smd_tty_info *info = tty->driver_data;
+        return smd_write_avail(info->ch);
+}
+static int smd_tty_chars_in_buffer(struct tty_struct *tty)
+{
+        struct smd_tty_info *info = tty->driver_data;
+        return smd_read_avail(info->ch);
+}
+static void smd_tty_unthrottle(struct tty_struct *tty)
+{
+        struct smd_tty_info *info = tty->driver_data;
+        smd_kick(info->ch);
+}
+static const struct tty_port_operations smd_tty_port_ops = {
+        .shutdown = smd_tty_port_shutdown,
+        .activate = smd_tty_port_activate,
+};
+static const struct tty_operations smd_tty_ops = {
+        .open = smd_tty_open,
+        .close = smd_tty_close,
+        .write = smd_tty_write,
+        .write_room = smd_tty_write_room,
+        .chars_in_buffer = smd_tty_chars_in_buffer,
+        .unthrottle = smd_tty_unthrottle,
+};
+static struct tty_driver *smd_tty_driver;
+static int __init smd_tty_init(void)
+{
+        int ret, i;
+        smd_tty_driver = alloc_tty_driver(MAX_SMD_TTYS);
+        if (smd_tty_driver == 0)
+                return -ENOMEM;
+        smd_tty_driver->owner = THIS_MODULE;
+        smd_tty_driver->driver_name = "smd_tty_driver";
+        smd_tty_driver->name = "smd";
+        smd_tty_driver->major = 0;
+        smd_tty_driver->minor_start = 0;
+        smd_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;
+        smd_tty_driver->subtype = SERIAL_TYPE_NORMAL;
+        smd_tty_driver->init_termios = tty_std_termios;
+        smd_tty_driver->init_termios.c_iflag = 0;
+        smd_tty_driver->init_termios.c_oflag = 0;
+        smd_tty_driver->init_termios.c_cflag = B38400 | CS8 | CREAD;
+        smd_tty_driver->init_termios.c_lflag = 0;
+        smd_tty_driver->flags = TTY_DRIVER_RESET_TERMIOS |
+                TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
+        tty_set_operations(smd_tty_driver, &smd_tty_ops);
+        ret = tty_register_driver(smd_tty_driver);
+        if (ret)
+                return ret;
+        for (i = 0; i < smd_tty_channels_len; i++) {
+                tty_port_init(&smd_tty[smd_tty_channels[i].id].port);
+                smd_tty[smd_tty_channels[i].id].port.ops = &smd_tty_port_ops;
+                tty_register_device(smd_tty_driver, smd_tty_channels[i].id, 0);
+        }
+        return 0;
+}
+module_init(smd_tty_init);
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 7f2f01058789..763537943a53 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -20,6 +20,10 @@
 * this driver as required for the omap-platform.
 */
+#if defined(CONFIG_SERIAL_OMAP_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/console.h>
@@ -190,7 +194,6 @@ static inline void receive_chars(struct uart_omap_port *up, int *status)
                        if (up->port.line == up->port.cons->index) {
                                /* Recover the break flag from console xmit */
                                lsr |= up->lsr_break_flag;
-                                up->lsr_break_flag = 0;
                        }
 #endif
                        if (lsr & UART_LSR_BI)
@@ -517,6 +520,9 @@ static int serial_omap_startup(struct uart_port *port)
        up->ier = UART_IER_RLSI | UART_IER_RDI;
        serial_out(up, UART_IER, up->ier);
+        /* Enable module level wake up */
+        serial_out(up, UART_OMAP_WER, OMAP_UART_WER_MOD_WKUP);
        up->port_activity = jiffies;
        return 0;
 }
@@ -824,9 +830,6 @@ serial_omap_pm(struct uart_port *port, unsigned int state,
        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
        serial_out(up, UART_EFR, efr);
        serial_out(up, UART_LCR, 0);
-        /* Enable module level wake up */
-        serial_out(up, UART_OMAP_WER,
-                (state != 0) ? OMAP_UART_WER_MOD_WKUP : 0);
 }
 static void serial_omap_release_port(struct uart_port *port)
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 70a61458ec42..a5ce9a5c018d 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -40,10 +40,11 @@ enum {
 #define PCH_UART_DRIVER_DEVICE "ttyPCH"
-#define PCH_UART_NR_GE_256FIFO          1
+/* Set the max number of UART port
-#define PCH_UART_NR_GE_64FIFO           3
+ * Intel EG20T PCH: 4 port
-#define PCH_UART_NR_GE  (PCH_UART_NR_GE_256FIFO+PCH_UART_NR_GE_64FIFO)
+ * OKI SEMICONDUCTOR ML7213 IOH: 3 port
-#define PCH_UART_NR     PCH_UART_NR_GE
+*/
+#define PCH_UART_NR     4
 #define PCH_UART_HANDLED_RX_INT (1<<((PCH_UART_HANDLED_RX_INT_SHIFT)<<1))
 #define PCH_UART_HANDLED_TX_INT (1<<((PCH_UART_HANDLED_TX_INT_SHIFT)<<1))
@@ -192,6 +193,8 @@ enum {
 #define PCH_UART_HAL_LOOP               (PCH_UART_MCR_LOOP)
 #define PCH_UART_HAL_AFE                (PCH_UART_MCR_AFE)
+#define PCI_VENDOR_ID_ROHM              0x10DB
 struct pch_uart_buffer {
        unsigned char *buf;
        int size;
@@ -215,6 +218,7 @@ struct eg20t_port {
        struct pch_uart_buffer rxbuf;
        unsigned int dmsr;
        unsigned int fcr;
+        unsigned int mcr;
        unsigned int use_dma;
        unsigned int use_dma_flag;
        struct dma_async_tx_descriptor  *desc_tx;
@@ -223,13 +227,44 @@ struct eg20t_port {
        struct pch_dma_slave            param_rx;
        struct dma_chan                 *chan_tx;
        struct dma_chan                 *chan_rx;
-        struct scatterlist              sg_tx;
+        struct scatterlist              *sg_tx_p;
+        int                             nent;
        struct scatterlist              sg_rx;
        int                             tx_dma_use;
        void                            *rx_buf_virt;
        dma_addr_t                      rx_buf_dma;
 };
+/**
+ * struct pch_uart_driver_data - private data structure for UART-DMA
+ * @port_type:                  The number of DMA channel
+ * @line_no:                    UART port line number (0, 1, 2...)
+ */
+struct pch_uart_driver_data {
+        int port_type;
+        int line_no;
+};
+enum pch_uart_num_t {
+        pch_et20t_uart0 = 0,
+        pch_et20t_uart1,
+        pch_et20t_uart2,
+        pch_et20t_uart3,
+        pch_ml7213_uart0,
+        pch_ml7213_uart1,
+        pch_ml7213_uart2,
+};
+static struct pch_uart_driver_data drv_dat[] = {
+        [pch_et20t_uart0] = {PCH_UART_8LINE, 0},
+        [pch_et20t_uart1] = {PCH_UART_2LINE, 1},
+        [pch_et20t_uart2] = {PCH_UART_2LINE, 2},
+        [pch_et20t_uart3] = {PCH_UART_2LINE, 3},
+        [pch_ml7213_uart0] = {PCH_UART_8LINE, 0},
+        [pch_ml7213_uart1] = {PCH_UART_2LINE, 1},
+        [pch_ml7213_uart2] = {PCH_UART_2LINE, 2},
+};
 static unsigned int default_baud = 9600;
 static const int trigger_level_256[4] = { 1, 64, 128, 224 };
 static const int trigger_level_64[4] = { 1, 16, 32, 56 };
@@ -278,7 +313,7 @@ static int pch_uart_hal_set_line(struct eg20t_port *priv, int baud,
        div = DIV_ROUND(priv->base_baud / 16, baud);
        if (div < 0 || USHRT_MAX <= div) {
-                pr_err("Invalid Baud(div=0x%x)\n", div);
+                dev_err(priv->port.dev, "Invalid Baud(div=0x%x)\n", div);
                return -EINVAL;
        }
@@ -286,17 +321,17 @@ static int pch_uart_hal_set_line(struct eg20t_port *priv, int baud,
        dlm = ((unsigned int)div >> 8) & 0x00FFU;
        if (parity & ~(PCH_UART_LCR_PEN | PCH_UART_LCR_EPS | PCH_UART_LCR_SP)) {
-                pr_err("Invalid parity(0x%x)\n", parity);
+                dev_err(priv->port.dev, "Invalid parity(0x%x)\n", parity);
                return -EINVAL;
        }
        if (bits & ~PCH_UART_LCR_WLS) {
-                pr_err("Invalid bits(0x%x)\n", bits);
+                dev_err(priv->port.dev, "Invalid bits(0x%x)\n", bits);
                return -EINVAL;
        }
        if (stb & ~PCH_UART_LCR_STB) {
-                pr_err("Invalid STB(0x%x)\n", stb);
+                dev_err(priv->port.dev, "Invalid STB(0x%x)\n", stb);
                return -EINVAL;
        }
@@ -304,7 +339,7 @@ static int pch_uart_hal_set_line(struct eg20t_port *priv, int baud,
        lcr |= bits;
        lcr |= stb;
-        pr_debug("%s:baud = %d, div = %04x, lcr = %02x (%lu)\n",
+        dev_dbg(priv->port.dev, "%s:baud = %d, div = %04x, lcr = %02x (%lu)\n",
                 __func__, baud, div, lcr, jiffies);
        iowrite8(PCH_UART_LCR_DLAB, priv->membase + UART_LCR);
        iowrite8(dll, priv->membase + PCH_UART_DLL);
@@ -318,7 +353,8 @@ static int pch_uart_hal_fifo_reset(struct eg20t_port *priv,
                                    unsigned int flag)
 {
        if (flag & ~(PCH_UART_FCR_TFR | PCH_UART_FCR_RFR)) {
-                pr_err("%s:Invalid flag(0x%x)\n", __func__, flag);
+                dev_err(priv->port.dev, "%s:Invalid flag(0x%x)\n",
+                        __func__, flag);
                return -EINVAL;
        }
@@ -337,17 +373,20 @@ static int pch_uart_hal_set_fifo(struct eg20t_port *priv,
        u8 fcr;
        if (dmamode & ~PCH_UART_FCR_DMS) {
-                pr_err("%s:Invalid DMA Mode(0x%x)\n", __func__, dmamode);
+                dev_err(priv->port.dev, "%s:Invalid DMA Mode(0x%x)\n",
+                        __func__, dmamode);
                return -EINVAL;
        }
        if (fifo_size & ~(PCH_UART_FCR_FIFOE | PCH_UART_FCR_FIFO256)) {
-                pr_err("%s:Invalid FIFO SIZE(0x%x)\n", __func__, fifo_size);
+                dev_err(priv->port.dev, "%s:Invalid FIFO SIZE(0x%x)\n",
+                        __func__, fifo_size);
                return -EINVAL;
        }
        if (trigger & ~PCH_UART_FCR_RFTL) {
-                pr_err("%s:Invalid TRIGGER(0x%x)\n", __func__, trigger);
+                dev_err(priv->port.dev, "%s:Invalid TRIGGER(0x%x)\n",
+                        __func__, trigger);
                return -EINVAL;
        }
@@ -386,7 +425,7 @@ static u8 pch_uart_hal_get_modem(struct eg20t_port *priv)
        return get_msr(priv, priv->membase);
 }
-static int pch_uart_hal_write(struct eg20t_port *priv,
+static void pch_uart_hal_write(struct eg20t_port *priv,
                              const unsigned char *buf, int tx_size)
 {
        int i;
@@ -396,7 +435,6 @@ static int pch_uart_hal_write(struct eg20t_port *priv,
                thr = buf[i++];
                iowrite8(thr, priv->membase + PCH_UART_THR);
        }
-        return i;
 }
 static int pch_uart_hal_read(struct eg20t_port *priv, unsigned char *buf,
@@ -452,7 +490,7 @@ static int push_rx(struct eg20t_port *priv, const unsigned char *buf,
        port = &priv->port;
        tty = tty_port_tty_get(&port->state->port);
        if (!tty) {
-                pr_debug("%s:tty is busy now", __func__);
+                dev_dbg(priv->port.dev, "%s:tty is busy now", __func__);
                return -EBUSY;
        }
@@ -469,8 +507,8 @@ static int pop_tx_x(struct eg20t_port *priv, unsigned char *buf)
        struct uart_port *port = &priv->port;
        if (port->x_char) {
-                pr_debug("%s:X character send %02x (%lu)\n", __func__,
+                dev_dbg(priv->port.dev, "%s:X character send %02x (%lu)\n",
-                        port->x_char, jiffies);
+                        __func__, port->x_char, jiffies);
                buf[0] = port->x_char;
                port->x_char = 0;
                ret = 1;
@@ -490,7 +528,7 @@ static int dma_push_rx(struct eg20t_port *priv, int size)
        port = &priv->port;
        tty = tty_port_tty_get(&port->state->port);
        if (!tty) {
-                pr_debug("%s:tty is busy now", __func__);
+                dev_dbg(priv->port.dev, "%s:tty is busy now", __func__);
                return 0;
        }
@@ -560,11 +598,13 @@ static void pch_request_dma(struct uart_port *port)
        /* Set Tx DMA */
        param = &priv->param_tx;
        param->dma_dev = &dma_dev->dev;
-        param->chan_id = priv->port.line;
+        param->chan_id = priv->port.line * 2; /* Tx = 0, 2, 4, ... */
        param->tx_reg = port->mapbase + UART_TX;
        chan = dma_request_channel(mask, filter, param);
        if (!chan) {
-                pr_err("%s:dma_request_channel FAILS(Tx)\n", __func__);
+                dev_err(priv->port.dev, "%s:dma_request_channel FAILS(Tx)\n",
+                        __func__);
                return;
        }
        priv->chan_tx = chan;
@@ -572,11 +612,13 @@ static void pch_request_dma(struct uart_port *port)
        /* Set Rx DMA */
        param = &priv->param_rx;
        param->dma_dev = &dma_dev->dev;
-        param->chan_id = priv->port.line + 1; /* Rx = Tx + 1 */
+        param->chan_id = priv->port.line * 2 + 1; /* Rx = Tx + 1 */
        param->rx_reg = port->mapbase + UART_RX;
        chan = dma_request_channel(mask, filter, param);
        if (!chan) {
-                pr_err("%s:dma_request_channel FAILS(Rx)\n", __func__);
+                dev_err(priv->port.dev, "%s:dma_request_channel FAILS(Rx)\n",
+                        __func__);
                dma_release_channel(priv->chan_tx);
                return;
        }
@@ -592,16 +634,20 @@ static void pch_dma_rx_complete(void *arg)
        struct eg20t_port *priv = arg;
        struct uart_port *port = &priv->port;
        struct tty_struct *tty = tty_port_tty_get(&port->state->port);
+        int count;
        if (!tty) {
-                pr_debug("%s:tty is busy now", __func__);
+                dev_dbg(priv->port.dev, "%s:tty is busy now", __func__);
                return;
        }
-        if (dma_push_rx(priv, priv->trigger_level))
+        dma_sync_sg_for_cpu(port->dev, &priv->sg_rx, 1, DMA_FROM_DEVICE);
+        count = dma_push_rx(priv, priv->trigger_level);
+        if (count)
                tty_flip_buffer_push(tty);
        tty_kref_put(tty);
+        async_tx_ack(priv->desc_rx);
+        pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_RX_INT);
 }
 static void pch_dma_tx_complete(void *arg)
@@ -609,16 +655,23 @@ static void pch_dma_tx_complete(void *arg)
        struct eg20t_port *priv = arg;
        struct uart_port *port = &priv->port;
        struct circ_buf *xmit = &port->state->xmit;
+        struct scatterlist *sg = priv->sg_tx_p;
+        int i;
-        xmit->tail += sg_dma_len(&priv->sg_tx);
+        for (i = 0; i < priv->nent; i++, sg++) {
+                xmit->tail += sg_dma_len(sg);
+                port->icount.tx += sg_dma_len(sg);
+        }
        xmit->tail &= UART_XMIT_SIZE - 1;
-        port->icount.tx += sg_dma_len(&priv->sg_tx);
        async_tx_ack(priv->desc_tx);
+        dma_unmap_sg(port->dev, sg, priv->nent, DMA_TO_DEVICE);
        priv->tx_dma_use = 0;
+        priv->nent = 0;
+        kfree(priv->sg_tx_p);
+        pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_TX_INT);
 }
-static int pop_tx(struct eg20t_port *priv, unsigned char *buf, int size)
+static int pop_tx(struct eg20t_port *priv, int size)
 {
        int count = 0;
        struct uart_port *port = &priv->port;
@@ -631,13 +684,13 @@ static int pop_tx(struct eg20t_port *priv, unsigned char *buf, int size)
                int cnt_to_end =
                    CIRC_CNT_TO_END(xmit->head, xmit->tail, UART_XMIT_SIZE);
                int sz = min(size - count, cnt_to_end);
-                memcpy(&buf[count], &xmit->buf[xmit->tail], sz);
+                pch_uart_hal_write(priv, &xmit->buf[xmit->tail], sz);
                xmit->tail = (xmit->tail + sz) & (UART_XMIT_SIZE - 1);
                count += sz;
        } while (!uart_circ_empty(xmit) && count < size);
 pop_tx_end:
-        pr_debug("%d characters. Remained %d characters. (%lu)\n",
+        dev_dbg(priv->port.dev, "%d characters. Remained %d characters.(%lu)\n",
                 count, size - count, jiffies);
        return count;
@@ -679,7 +732,7 @@ static int dma_handle_rx(struct eg20t_port *priv)
        sg_init_table(&priv->sg_rx, 1); /* Initialize SG table */
-        sg_dma_len(sg) = priv->fifo_size;
+        sg_dma_len(sg) = priv->trigger_level;
        sg_set_page(&priv->sg_rx, virt_to_page(priv->rx_buf_virt),
                     sg_dma_len(sg), (unsigned long)priv->rx_buf_virt &
@@ -689,7 +742,8 @@ static int dma_handle_rx(struct eg20t_port *priv)
        desc = priv->chan_rx->device->device_prep_slave_sg(priv->chan_rx,
                        sg, 1, DMA_FROM_DEVICE,
-                        DMA_PREP_INTERRUPT);
+                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
        if (!desc)
                return 0;
@@ -706,14 +760,14 @@ static unsigned int handle_tx(struct eg20t_port *priv)
 {
        struct uart_port *port = &priv->port;
        struct circ_buf *xmit = &port->state->xmit;
-        int ret;
        int fifo_size;
        int tx_size;
        int size;
        int tx_empty;
        if (!priv->start_tx) {
-                pr_info("%s:Tx isn't started. (%lu)\n", __func__, jiffies);
+                dev_info(priv->port.dev, "%s:Tx isn't started. (%lu)\n",
+                        __func__, jiffies);
                pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_TX_INT);
                priv->tx_empty = 1;
                return 0;
@@ -728,17 +782,21 @@ static unsigned int handle_tx(struct eg20t_port *priv)
                fifo_size--;
        }
        size = min(xmit->head - xmit->tail, fifo_size);
-        tx_size = pop_tx(priv, xmit->buf, size);
+        if (size < 0)
+                size = fifo_size;
+        tx_size = pop_tx(priv, size);
        if (tx_size > 0) {
-                ret = pch_uart_hal_write(priv, xmit->buf, tx_size);
+                port->icount.tx += tx_size;
-                port->icount.tx += ret;
                tx_empty = 0;
        }
        priv->tx_empty = tx_empty;
-        if (tx_empty)
+        if (tx_empty) {
                pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_TX_INT);
+                uart_write_wakeup(port);
+        }
        return PCH_UART_HANDLED_TX_INT;
 }
@@ -747,14 +805,28 @@ static unsigned int dma_handle_tx(struct eg20t_port *priv)
 {
        struct uart_port *port = &priv->port;
        struct circ_buf *xmit = &port->state->xmit;
-        struct scatterlist *sg = &priv->sg_tx;
+        struct scatterlist *sg;
        int nent;
        int fifo_size;
        int tx_empty;
        struct dma_async_tx_descriptor *desc;
+        int num;
+        int i;
+        int bytes;
+        int size;
+        int rem;
        if (!priv->start_tx) {
-                pr_info("%s:Tx isn't started. (%lu)\n", __func__, jiffies);
+                dev_info(priv->port.dev, "%s:Tx isn't started. (%lu)\n",
+                        __func__, jiffies);
+                pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_TX_INT);
+                priv->tx_empty = 1;
+                return 0;
+        }
+        if (priv->tx_dma_use) {
+                dev_dbg(priv->port.dev, "%s:Tx is not completed. (%lu)\n",
+                        __func__, jiffies);
                pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_TX_INT);
                priv->tx_empty = 1;
                return 0;
@@ -769,37 +841,73 @@ static unsigned int dma_handle_tx(struct eg20t_port *priv)
                fifo_size--;
        }
-        pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_TX_INT);
+        bytes = min((int)CIRC_CNT(xmit->head, xmit->tail,
+                             UART_XMIT_SIZE), CIRC_CNT_TO_END(xmit->head,
+                             xmit->tail, UART_XMIT_SIZE));
+        if (!bytes) {
+                dev_dbg(priv->port.dev, "%s 0 bytes return\n", __func__);
+                pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_TX_INT);
+                uart_write_wakeup(port);
+                return 0;
+        }
+        if (bytes > fifo_size) {
+                num = bytes / fifo_size + 1;
+                size = fifo_size;
+                rem = bytes % fifo_size;
+        } else {
+                num = 1;
+                size = bytes;
+                rem = bytes;
+        }
+        dev_dbg(priv->port.dev, "%s num=%d size=%d rem=%d\n",
+                __func__, num, size, rem);
        priv->tx_dma_use = 1;
-        sg_init_table(&priv->sg_tx, 1); /* Initialize SG table */
+        priv->sg_tx_p = kzalloc(sizeof(struct scatterlist)*num, GFP_ATOMIC);
-        sg_set_page(&priv->sg_tx, virt_to_page(xmit->buf),
+        sg_init_table(priv->sg_tx_p, num); /* Initialize SG table */
-                    UART_XMIT_SIZE, (int)xmit->buf & ~PAGE_MASK);
+        sg = priv->sg_tx_p;
-        nent = dma_map_sg(port->dev, &priv->sg_tx, 1, DMA_TO_DEVICE);
+        for (i = 0; i < num; i++, sg++) {
+                if (i == (num - 1))
+                        sg_set_page(sg, virt_to_page(xmit->buf),
+                                    rem, fifo_size * i);
+                else
+                        sg_set_page(sg, virt_to_page(xmit->buf),
+                                    size, fifo_size * i);
+        }
+        sg = priv->sg_tx_p;
+        nent = dma_map_sg(port->dev, sg, num, DMA_TO_DEVICE);
        if (!nent) {
-                pr_err("%s:dma_map_sg Failed\n", __func__);
+                dev_err(priv->port.dev, "%s:dma_map_sg Failed\n", __func__);
                return 0;
        }
+        priv->nent = nent;
-        sg->offset = xmit->tail & (UART_XMIT_SIZE - 1);
-        sg_dma_address(sg) = (sg_dma_address(sg) & ~(UART_XMIT_SIZE - 1)) +
+        for (i = 0; i < nent; i++, sg++) {
-                              sg->offset;
+                sg->offset = (xmit->tail & (UART_XMIT_SIZE - 1)) +
-        sg_dma_len(sg) = min((int)CIRC_CNT(xmit->head, xmit->tail,
+                              fifo_size * i;
-                             UART_XMIT_SIZE), CIRC_CNT_TO_END(xmit->head,
+                sg_dma_address(sg) = (sg_dma_address(sg) &
-                             xmit->tail, UART_XMIT_SIZE));
+                                    ~(UART_XMIT_SIZE - 1)) + sg->offset;
+                if (i == (nent - 1))
+                        sg_dma_len(sg) = rem;
+                else
+                        sg_dma_len(sg) = size;
+        }
        desc = priv->chan_tx->device->device_prep_slave_sg(priv->chan_tx,
-                sg, nent, DMA_TO_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+                                        priv->sg_tx_p, nent, DMA_TO_DEVICE,
+                                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
        if (!desc) {
-                pr_err("%s:device_prep_slave_sg Failed\n", __func__);
+                dev_err(priv->port.dev, "%s:device_prep_slave_sg Failed\n",
+                        __func__);
                return 0;
        }
+        dma_sync_sg_for_device(port->dev, priv->sg_tx_p, nent, DMA_TO_DEVICE);
-        dma_sync_sg_for_device(port->dev, sg, 1, DMA_TO_DEVICE);
        priv->desc_tx = desc;
        desc->callback = pch_dma_tx_complete;
        desc->callback_param = priv;
@@ -854,10 +962,16 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)
                        }
                        break;
                case PCH_UART_IID_RDR:  /* Received Data Ready */
-                        if (priv->use_dma)
+                        if (priv->use_dma) {
+                                pch_uart_hal_disable_interrupt(priv,
+                                                        PCH_UART_HAL_RX_INT);
                                ret = dma_handle_rx(priv);
-                        else
+                                if (!ret)
+                                        pch_uart_hal_enable_interrupt(priv,
+                                                        PCH_UART_HAL_RX_INT);
+                        } else {
                                ret = handle_rx(priv);
+                        }
                        break;
                case PCH_UART_IID_RDR_TO:       /* Received Data Ready
                                                   (FIFO Timeout) */
@@ -874,7 +988,8 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)
                        ret = PCH_UART_HANDLED_MS_INT;
                        break;
                default:        /* Never junp to this label */
-                        pr_err("%s:iid=%d (%lu)\n", __func__, iid, jiffies);
+                        dev_err(priv->port.dev, "%s:iid=%d (%lu)\n", __func__,
+                                iid, jiffies);
                        ret = -1;
                        break;
                }
@@ -932,7 +1047,6 @@ static unsigned int pch_uart_get_mctrl(struct uart_port *port)
 static void pch_uart_set_mctrl(struct uart_port *port, unsigned int mctrl)
 {
        u32 mcr = 0;
-        unsigned int dat;
        struct eg20t_port *priv = container_of(port, struct eg20t_port, port);
        if (mctrl & TIOCM_DTR)
@@ -942,11 +1056,11 @@ static void pch_uart_set_mctrl(struct uart_port *port, unsigned int mctrl)
        if (mctrl & TIOCM_LOOP)
                mcr |= UART_MCR_LOOP;
-        if (mctrl) {
+        if (priv->mcr & UART_MCR_AFE)
-                dat = pch_uart_get_mctrl(port);
+                mcr |= UART_MCR_AFE;
-                dat |= mcr;
-                iowrite8(dat, priv->membase + UART_MCR);
+        if (mctrl)
-        }
+                iowrite8(mcr, priv->membase + UART_MCR);
 }
 static void pch_uart_stop_tx(struct uart_port *port)
@@ -963,9 +1077,13 @@ static void pch_uart_start_tx(struct uart_port *port)
        priv = container_of(port, struct eg20t_port, port);
-        if (priv->use_dma)
+        if (priv->use_dma) {
-                if (priv->tx_dma_use)
+                if (priv->tx_dma_use) {
+                        dev_dbg(priv->port.dev, "%s : Tx DMA is NOT empty.\n",
+                                __func__);
                        return;
+                }
+        }
        priv->start_tx = 1;
        pch_uart_hal_enable_interrupt(priv, PCH_UART_HAL_TX_INT);
@@ -1010,7 +1128,12 @@ static int pch_uart_startup(struct uart_port *port)
        priv = container_of(port, struct eg20t_port, port);
        priv->tx_empty = 1;
-        port->uartclk = priv->base_baud;
+        if (port->uartclk)
+                priv->base_baud = port->uartclk;
+        else
+                port->uartclk = priv->base_baud;
        pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_ALL_INT);
        ret = pch_uart_hal_set_line(priv, default_baud,
                              PCH_UART_HAL_PARITY_NONE, PCH_UART_HAL_8BIT,
@@ -1081,7 +1204,8 @@ static void pch_uart_shutdown(struct uart_port *port)
        ret = pch_uart_hal_set_fifo(priv, PCH_UART_HAL_DMA_MODE0,
                              PCH_UART_HAL_FIFO_DIS, PCH_UART_HAL_TRIGGER1);
        if (ret)
-                pr_err("pch_uart_hal_set_fifo Failed(ret=%d)\n", ret);
+                dev_err(priv->port.dev,
+                        "pch_uart_hal_set_fifo Failed(ret=%d)\n", ret);
        if (priv->use_dma_flag)
                pch_free_dma(port);
@@ -1130,6 +1254,13 @@ static void pch_uart_set_termios(struct uart_port *port,
        } else {
                parity = PCH_UART_HAL_PARITY_NONE;
        }
+        /* Only UART0 has auto hardware flow function */
+        if ((termios->c_cflag & CRTSCTS) && (priv->fifo_size == 256))
+                priv->mcr |= UART_MCR_AFE;
+        else
+                priv->mcr &= ~UART_MCR_AFE;
        termios->c_cflag &= ~CMSPAR; /* Mark/Space parity is not supported */
        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk / 16);
@@ -1202,17 +1333,19 @@ static int pch_uart_verify_port(struct uart_port *port,
        priv = container_of(port, struct eg20t_port, port);
        if (serinfo->flags & UPF_LOW_LATENCY) {
-                pr_info("PCH UART : Use PIO Mode (without DMA)\n");
+                dev_info(priv->port.dev,
+                        "PCH UART : Use PIO Mode (without DMA)\n");
                priv->use_dma = 0;
                serinfo->flags &= ~UPF_LOW_LATENCY;
        } else {
 #ifndef CONFIG_PCH_DMA
-                pr_err("%s : PCH DMA is not Loaded.\n", __func__);
+                dev_err(priv->port.dev, "%s : PCH DMA is not Loaded.\n",
+                        __func__);
                return -EOPNOTSUPP;
 #endif
                priv->use_dma = 1;
                priv->use_dma_flag = 1;
-                pr_info("PCH UART : Use DMA Mode\n");
+                dev_info(priv->port.dev, "PCH UART : Use DMA Mode\n");
        }
        return 0;
@@ -1249,7 +1382,7 @@ static struct uart_driver pch_uart_driver = {
 };
 static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
-                                                int port_type)
+                                             const struct pci_device_id *id)
 {
        struct eg20t_port *priv;
        int ret;
@@ -1257,7 +1390,11 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
        unsigned int mapbase;
        unsigned char *rxbuf;
        int fifosize, base_baud;
-        static int num;
+        int port_type;
+        struct pch_uart_driver_data *board;
+        board = &drv_dat[id->driver_data];
+        port_type = board->port_type;
        priv = kzalloc(sizeof(struct eg20t_port), GFP_KERNEL);
        if (priv == NULL)
@@ -1269,11 +1406,11 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
        switch (port_type) {
        case PORT_UNKNOWN:
-                fifosize = 256; /* UART0 */
+                fifosize = 256; /* EG20T/ML7213: UART0 */
                base_baud = 1843200; /* 1.8432MHz */
                break;
        case PORT_8250:
-                fifosize = 64; /* UART1~3 */
+                fifosize = 64; /* EG20T:UART1~3  ML7213: UART1~2*/
                base_baud = 1843200; /* 1.8432MHz */
                break;
        default:
@@ -1302,11 +1439,14 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
        priv->port.ops = &pch_uart_ops;
        priv->port.flags = UPF_BOOT_AUTOCONF;
        priv->port.fifosize = fifosize;
-        priv->port.line = num++;
+        priv->port.line = board->line_no;
        priv->trigger = PCH_UART_HAL_TRIGGER_M;
+        spin_lock_init(&priv->port.lock);
        pci_set_drvdata(pdev, priv);
        pch_uart_hal_request(pdev, fifosize, base_baud);
        ret = uart_add_one_port(&pch_uart_driver, &priv->port);
        if (ret < 0)
                goto init_port_hal_free;
@@ -1377,13 +1517,19 @@ static int pch_uart_pci_resume(struct pci_dev *pdev)
 static DEFINE_PCI_DEVICE_TABLE(pch_uart_pci_id) = {
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8811),
-         .driver_data = PCH_UART_8LINE},
+         .driver_data = pch_et20t_uart0},
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8812),
-         .driver_data = PCH_UART_2LINE},
+         .driver_data = pch_et20t_uart1},
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8813),
-         .driver_data = PCH_UART_2LINE},
+         .driver_data = pch_et20t_uart2},
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8814),
-         .driver_data = PCH_UART_2LINE},
+         .driver_data = pch_et20t_uart3},
+        {PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8027),
+         .driver_data = pch_ml7213_uart0},
+        {PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8028),
+         .driver_data = pch_ml7213_uart1},
+        {PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8029),
+         .driver_data = pch_ml7213_uart2},
        {0,},
 };
@@ -1397,7 +1543,7 @@ static int __devinit pch_uart_pci_probe(struct pci_dev *pdev,
        if (ret < 0)
                goto probe_error;
-        priv = pch_uart_init_port(pdev, id->driver_data);
+        priv = pch_uart_init_port(pdev, id);
        if (!priv) {
                ret = -EBUSY;
                goto probe_disable_device;
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 460a72d91bb7..733fe8e73f0f 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -905,7 +905,7 @@ static int uart_get_lsr_info(struct tty_struct *tty,
        return put_user(result, value);
 }
-static int uart_tiocmget(struct tty_struct *tty, struct file *file)
+static int uart_tiocmget(struct tty_struct *tty)
 {
        struct uart_state *state = tty->driver_data;
        struct tty_port *port = &state->port;
@@ -913,10 +913,8 @@ static int uart_tiocmget(struct tty_struct *tty, struct file *file)
        int result = -EIO;
        mutex_lock(&port->mutex);
-        if ((!file || !tty_hung_up_p(file)) &&
+        if (!(tty->flags & (1 << TTY_IO_ERROR))) {
-            !(tty->flags & (1 << TTY_IO_ERROR))) {
                result = uport->mctrl;
                spin_lock_irq(&uport->lock);
                result |= uport->ops->get_mctrl(uport);
                spin_unlock_irq(&uport->lock);
@@ -927,8 +925,7 @@ static int uart_tiocmget(struct tty_struct *tty, struct file *file)
 }
 static int
-uart_tiocmset(struct tty_struct *tty, struct file *file,
+uart_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear)
-              unsigned int set, unsigned int clear)
 {
        struct uart_state *state = tty->driver_data;
        struct uart_port *uport = state->uart_port;
@@ -936,8 +933,7 @@ uart_tiocmset(struct tty_struct *tty, struct file *file,
        int ret = -EIO;
        mutex_lock(&port->mutex);
-        if ((!file || !tty_hung_up_p(file)) &&
+        if (!(tty->flags & (1 << TTY_IO_ERROR))) {
-            !(tty->flags & (1 << TTY_IO_ERROR))) {
                uart_update_mctrl(uport, set, clear);
                ret = 0;
        }
@@ -1103,7 +1099,7 @@ static int uart_get_icount(struct tty_struct *tty,
 * Called via sys_ioctl.  We can use spin_lock_irq() here.
 */
 static int
-uart_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd,
+uart_ioctl(struct tty_struct *tty, unsigned int cmd,
           unsigned long arg)
 {
        struct uart_state *state = tty->driver_data;
@@ -1156,7 +1152,7 @@ uart_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd,
        mutex_lock(&port->mutex);
-        if (tty_hung_up_p(filp)) {
+        if (tty->flags & (1 << TTY_IO_ERROR)) {
                ret = -EIO;
                goto out_up;
        }
@@ -2064,7 +2060,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
        /*
         * Re-enable the console device after suspending.
         */
-        if (console_suspend_enabled && uart_console(uport)) {
+        if (uart_console(uport)) {
                /*
                 * First try to use the console cflag setting.
                 */
@@ -2077,9 +2073,9 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
                if (port->tty && port->tty->termios && termios.c_cflag == 0)
                        termios = *(port->tty->termios);
-                uart_change_pm(state, 0);
                uport->ops->set_termios(uport, &termios, NULL);
-                console_start(uport->cons);
+                if (console_suspend_enabled)
+                        console_start(uport->cons);
        }
        if (port->flags & ASYNC_SUSPENDED) {
diff --git a/drivers/char/synclink.c b/drivers/tty/synclink.c
index 3a6824f12be2..18888d005a0a 100644
--- a/drivers/char/synclink.c
+++ b/drivers/tty/synclink.c
@@ -823,8 +823,8 @@ static isr_dispatch_func UscIsrTable[7] =
 /*
 * ioctl call handlers
 */
-static int tiocmget(struct tty_struct *tty, struct file *file);
+static int tiocmget(struct tty_struct *tty);
-static int tiocmset(struct tty_struct *tty, struct file *file,
+static int tiocmset(struct tty_struct *tty,
                    unsigned int set, unsigned int clear);
 static int mgsl_get_stats(struct mgsl_struct * info, struct mgsl_icount
        __user *user_icount);
@@ -2846,7 +2846,7 @@ static int modem_input_wait(struct mgsl_struct *info,int arg)
 /* return the state of the serial control and status signals
 */
-static int tiocmget(struct tty_struct *tty, struct file *file)
+static int tiocmget(struct tty_struct *tty)
 {
        struct mgsl_struct *info = tty->driver_data;
        unsigned int result;
@@ -2871,8 +2871,8 @@ static int tiocmget(struct tty_struct *tty, struct file *file)
 /* set modem control signals (DTR/RTS)
 */
-static int tiocmset(struct tty_struct *tty, struct file *file,
+static int tiocmset(struct tty_struct *tty,
-                    unsigned int set, unsigned int clear)
+                                    unsigned int set, unsigned int clear)
 {
        struct mgsl_struct *info = tty->driver_data;
        unsigned long flags;
@@ -2962,13 +2962,12 @@ static int msgl_get_icount(struct tty_struct *tty,
 * Arguments:
 * 
 *      tty     pointer to tty instance data
- *      file    pointer to associated file object for device
 *      cmd     IOCTL command code
 *      arg     command argument/context
 *      
 * Return Value:        0 if success, otherwise error code
 */
-static int mgsl_ioctl(struct tty_struct *tty, struct file * file,
+static int mgsl_ioctl(struct tty_struct *tty,
                    unsigned int cmd, unsigned long arg)
 {
        struct mgsl_struct * info = tty->driver_data;
diff --git a/drivers/char/synclink_gt.c b/drivers/tty/synclink_gt.c
index d01fffeac951..a35dd549a008 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -154,7 +154,7 @@ static void flush_buffer(struct tty_struct *tty);
 static void tx_hold(struct tty_struct *tty);
 static void tx_release(struct tty_struct *tty);
-static int  ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg);
+static int  ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg);
 static int  chars_in_buffer(struct tty_struct *tty);
 static void throttle(struct tty_struct * tty);
 static void unthrottle(struct tty_struct * tty);
@@ -512,9 +512,9 @@ static int  tx_abort(struct slgt_info *info);
 static int  rx_enable(struct slgt_info *info, int enable);
 static int  modem_input_wait(struct slgt_info *info,int arg);
 static int  wait_mgsl_event(struct slgt_info *info, int __user *mask_ptr);
-static int  tiocmget(struct tty_struct *tty, struct file *file);
+static int  tiocmget(struct tty_struct *tty);
-static int  tiocmset(struct tty_struct *tty, struct file *file,
+static int  tiocmset(struct tty_struct *tty,
-                     unsigned int set, unsigned int clear);
+                                unsigned int set, unsigned int clear);
 static int set_break(struct tty_struct *tty, int break_state);
 static int  get_interface(struct slgt_info *info, int __user *if_mode);
 static int  set_interface(struct slgt_info *info, int if_mode);
@@ -1030,13 +1030,12 @@ static void tx_release(struct tty_struct *tty)
 * Arguments
 *
 *      tty     pointer to tty instance data
- *      file    pointer to associated file object for device
 *      cmd     IOCTL command code
 *      arg     command argument/context
 *
 * Return 0 if success, otherwise error code
 */
-static int ioctl(struct tty_struct *tty, struct file *file,
+static int ioctl(struct tty_struct *tty,
                 unsigned int cmd, unsigned long arg)
 {
        struct slgt_info *info = tty->driver_data;
@@ -1200,7 +1199,7 @@ static long set_params32(struct slgt_info *info, struct MGSL_PARAMS32 __user *ne
        return 0;
 }
-static long slgt_compat_ioctl(struct tty_struct *tty, struct file *file,
+static long slgt_compat_ioctl(struct tty_struct *tty,
                         unsigned int cmd, unsigned long arg)
 {
        struct slgt_info *info = tty->driver_data;
@@ -1239,7 +1238,7 @@ static long slgt_compat_ioctl(struct tty_struct *tty, struct file *file,
        case MGSL_IOCSIF:
        case MGSL_IOCSXSYNC:
        case MGSL_IOCSXCTRL:
-                rc = ioctl(tty, file, cmd, arg);
+                rc = ioctl(tty, cmd, arg);
                break;
        }
@@ -3195,7 +3194,7 @@ static int modem_input_wait(struct slgt_info *info,int arg)
 /*
 *  return state of serial control and status signals
 */
-static int tiocmget(struct tty_struct *tty, struct file *file)
+static int tiocmget(struct tty_struct *tty)
 {
        struct slgt_info *info = tty->driver_data;
        unsigned int result;
@@ -3223,7 +3222,7 @@ static int tiocmget(struct tty_struct *tty, struct file *file)
 *              TIOCMSET = set/clear signal values
 *      value   bit mask for command
 */
-static int tiocmset(struct tty_struct *tty, struct file *file,
+static int tiocmset(struct tty_struct *tty,
                    unsigned int set, unsigned int clear)
 {
        struct slgt_info *info = tty->driver_data;
diff --git a/drivers/char/synclinkmp.c b/drivers/tty/synclinkmp.c
index 2f9eb4b0dec1..327343694473 100644
--- a/drivers/char/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -520,7 +520,7 @@ static void flush_buffer(struct tty_struct *tty);
 static void tx_hold(struct tty_struct *tty);
 static void tx_release(struct tty_struct *tty);
-static int  ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg);
+static int  ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg);
 static int  chars_in_buffer(struct tty_struct *tty);
 static void throttle(struct tty_struct * tty);
 static void unthrottle(struct tty_struct * tty);
@@ -546,9 +546,9 @@ static int  tx_abort(SLMP_INFO *info);
 static int  rx_enable(SLMP_INFO *info, int enable);
 static int  modem_input_wait(SLMP_INFO *info,int arg);
 static int  wait_mgsl_event(SLMP_INFO *info, int __user *mask_ptr);
-static int  tiocmget(struct tty_struct *tty, struct file *file);
+static int  tiocmget(struct tty_struct *tty);
-static int  tiocmset(struct tty_struct *tty, struct file *file,
+static int  tiocmset(struct tty_struct *tty,
-                     unsigned int set, unsigned int clear);
+                        unsigned int set, unsigned int clear);
 static int  set_break(struct tty_struct *tty, int break_state);
 static void add_device(SLMP_INFO *info);
@@ -1248,13 +1248,12 @@ static void tx_release(struct tty_struct *tty)
 * Arguments:
 *
 *      tty     pointer to tty instance data
- *      file    pointer to associated file object for device
 *      cmd     IOCTL command code
 *      arg     command argument/context
 *
 * Return Value:        0 if success, otherwise error code
 */
-static int ioctl(struct tty_struct *tty, struct file *file,
+static int ioctl(struct tty_struct *tty,
                 unsigned int cmd, unsigned long arg)
 {
        SLMP_INFO *info = tty->driver_data;
@@ -3207,7 +3206,7 @@ static int modem_input_wait(SLMP_INFO *info,int arg)
 /* return the state of the serial control and status signals
 */
-static int tiocmget(struct tty_struct *tty, struct file *file)
+static int tiocmget(struct tty_struct *tty)
 {
        SLMP_INFO *info = tty->driver_data;
        unsigned int result;
@@ -3232,8 +3231,8 @@ static int tiocmget(struct tty_struct *tty, struct file *file)
 /* set modem control signals (DTR/RTS)
 */
-static int tiocmset(struct tty_struct *tty, struct file *file,
+static int tiocmset(struct tty_struct *tty,
-                    unsigned int set, unsigned int clear)
+                                        unsigned int set, unsigned int clear)
 {
        SLMP_INFO *info = tty->driver_data;
        unsigned long flags;
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 0065da4b11c1..8ef2d69470ec 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -2465,12 +2465,12 @@ out:
 *      Locking: none (up to the driver)
 */
-static int tty_tiocmget(struct tty_struct *tty, struct file *file, int __user *p)
+static int tty_tiocmget(struct tty_struct *tty, int __user *p)
 {
        int retval = -EINVAL;
        if (tty->ops->tiocmget) {
-                retval = tty->ops->tiocmget(tty, file);
+                retval = tty->ops->tiocmget(tty);
                if (retval >= 0)
                        retval = put_user(retval, p);
@@ -2481,7 +2481,6 @@ static int tty_tiocmget(struct tty_struct *tty, struct file *file, int __user *p
 /**
 *      tty_tiocmset            -       set modem status
 *      @tty: tty device
- *      @file: user file pointer
 *      @cmd: command - clear bits, set bits or set all
 *      @p: pointer to desired bits
 *
@@ -2491,7 +2490,7 @@ static int tty_tiocmget(struct tty_struct *tty, struct file *file, int __user *p
 *      Locking: none (up to the driver)
 */
-static int tty_tiocmset(struct tty_struct *tty, struct file *file, unsigned int cmd,
+static int tty_tiocmset(struct tty_struct *tty, unsigned int cmd,
             unsigned __user *p)
 {
        int retval;
@@ -2518,7 +2517,7 @@ static int tty_tiocmset(struct tty_struct *tty, struct file *file, unsigned int
        }
        set &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;
        clear &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;
-        return tty->ops->tiocmset(tty, file, set, clear);
+        return tty->ops->tiocmset(tty, set, clear);
 }
 static int tty_tiocgicount(struct tty_struct *tty, void __user *arg)
@@ -2627,6 +2626,11 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                return put_user(tty->ldisc->ops->num, (int __user *)p);
        case TIOCSETD:
                return tiocsetd(tty, p);
+        case TIOCVHANGUP:
+                if (!capable(CAP_SYS_ADMIN))
+                        return -EPERM;
+                tty_vhangup(tty);
+                return 0;
        case TIOCGDEV:
        {
                unsigned int ret = new_encode_dev(tty_devnum(real_tty));
@@ -2655,11 +2659,11 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                return send_break(tty, arg ? arg*100 : 250);
        case TIOCMGET:
-                return tty_tiocmget(tty, file, p);
+                return tty_tiocmget(tty, p);
        case TIOCMSET:
        case TIOCMBIC:
        case TIOCMBIS:
-                return tty_tiocmset(tty, file, cmd, p);
+                return tty_tiocmset(tty, cmd, p);
        case TIOCGICOUNT:
                retval = tty_tiocgicount(tty, p);
                /* For the moment allow fall through to the old method */
@@ -2677,7 +2681,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                break;
        }
        if (tty->ops->ioctl) {
-                retval = (tty->ops->ioctl)(tty, file, cmd, arg);
+                retval = (tty->ops->ioctl)(tty, cmd, arg);
                if (retval != -ENOIOCTLCMD)
                        return retval;
        }
@@ -2705,7 +2709,7 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd,
                return -EINVAL;
        if (tty->ops->compat_ioctl) {
-                retval = (tty->ops->compat_ioctl)(tty, file, cmd, arg);
+                retval = (tty->ops->compat_ioctl)(tty, cmd, arg);
                if (retval != -ENOIOCTLCMD)
                        return retval;
        }
diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index 0c1889971459..1a1135d580a2 100644
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -486,7 +486,7 @@ int tty_termios_hw_change(struct ktermios *a, struct ktermios *b)
 EXPORT_SYMBOL(tty_termios_hw_change);
 /**
- *      change_termios          -       update termios values
+ *      tty_set_termios         -       update termios values
 *      @tty: tty to update
 *      @new_termios: desired new value
 *
@@ -497,7 +497,7 @@ EXPORT_SYMBOL(tty_termios_hw_change);
 *      Locking: termios_mutex
 */
-static void change_termios(struct tty_struct *tty, struct ktermios *new_termios)
+int tty_set_termios(struct tty_struct *tty, struct ktermios *new_termios)
 {
        struct ktermios old_termios;
        struct tty_ldisc *ld;
@@ -553,7 +553,9 @@ static void change_termios(struct tty_struct *tty, struct ktermios *new_termios)
                tty_ldisc_deref(ld);
        }
        mutex_unlock(&tty->termios_mutex);
+        return 0;
 }
+EXPORT_SYMBOL_GPL(tty_set_termios);
 /**
 *      set_termios             -       set termios values for a tty
@@ -562,7 +564,7 @@ static void change_termios(struct tty_struct *tty, struct ktermios *new_termios)
 *      @opt: option information
 *
 *      Helper function to prepare termios data and run necessary other
- *      functions before using change_termios to do the actual changes.
+ *      functions before using tty_set_termios to do the actual changes.
 *
 *      Locking:
 *              Called functions take ldisc and termios_mutex locks
@@ -620,7 +622,7 @@ static int set_termios(struct tty_struct *tty, void __user *arg, int opt)
                        return -EINTR;
        }
-        change_termios(tty, &tmp_termios);
+        tty_set_termios(tty, &tmp_termios);
        /* FIXME: Arguably if tmp_termios == tty->termios AND the
           actual requested termios was not tmp_termios then we may
@@ -797,7 +799,7 @@ static int set_sgttyb(struct tty_struct *tty, struct sgttyb __user *sgttyb)
                                                termios.c_ospeed);
 #endif
        mutex_unlock(&tty->termios_mutex);
-        change_termios(tty, &termios);
+        tty_set_termios(tty, &termios);
        return 0;
 }
 #endif
@@ -951,6 +953,8 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,
        int ret = 0;
        struct ktermios kterm;
+        BUG_ON(file == NULL);
        if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
            tty->driver->subtype == PTY_TYPE_MASTER)
                real_tty = tty->link;
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index 4214d58276f7..c42f402db9ba 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -535,6 +535,19 @@ static int tty_ldisc_halt(struct tty_struct *tty)
 }
 /**
+ *      tty_ldisc_flush_works   -       flush all works of a tty
+ *      @tty: tty device to flush works for
+ *
+ *      Sync flush all works belonging to @tty.
+ */
+static void tty_ldisc_flush_works(struct tty_struct *tty)
+{
+        flush_work_sync(&tty->hangup_work);
+        flush_work_sync(&tty->SAK_work);
+        flush_delayed_work_sync(&tty->buf.work);
+}
+/**
 *      tty_ldisc_wait_idle     -       wait for the ldisc to become idle
 *      @tty: tty to wait for
 *
@@ -653,7 +666,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
        mutex_unlock(&tty->ldisc_mutex);
-        flush_scheduled_work();
+        tty_ldisc_flush_works(tty);
        retval = tty_ldisc_wait_idle(tty);
@@ -905,7 +918,7 @@ void tty_ldisc_release(struct tty_struct *tty, struct tty_struct *o_tty)
        tty_unlock();
        tty_ldisc_halt(tty);
-        flush_scheduled_work();
+        tty_ldisc_flush_works(tty);
        tty_lock();
        mutex_lock(&tty->ldisc_mutex);
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index e95d7876ca6b..6dd3c68c13ad 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -654,7 +654,8 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
        if (value >= ARRAY_SIZE(fn_handler))
                return;
        if ((kbd->kbdmode == VC_RAW ||
-             kbd->kbdmode == VC_MEDIUMRAW) &&
+             kbd->kbdmode == VC_MEDIUMRAW ||
+             kbd->kbdmode == VC_OFF) &&
             value != KVAL(K_SAK))
                return;         /* SAK is allowed even in raw mode */
        fn_handler[value](vc);
@@ -1295,7 +1296,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
        if (rc == NOTIFY_STOP)
                return;
-        if (raw_mode && type != KT_SPEC && type != KT_SHIFT)
+        if ((raw_mode || kbd->kbdmode == VC_OFF) && type != KT_SPEC && type != KT_SHIFT)
                return;
        (*k_handler[type])(vc, keysym & 0xff, !down);
diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c
index a672ed192d33..7b3bfbe2e6de 100644
--- a/drivers/tty/vt/vc_screen.c
+++ b/drivers/tty/vt/vc_screen.c
@@ -28,7 +28,6 @@
 #include <linux/interrupt.h>
 #include <linux/mm.h>
 #include <linux/init.h>
-#include <linux/mutex.h>
 #include <linux/vt_kern.h>
 #include <linux/selection.h>
 #include <linux/kbd_kern.h>
@@ -51,6 +50,8 @@
 #undef addr
 #define HEADER_SIZE     4
+#define CON_BUF_SIZE (CONFIG_BASE_SMALL ? 256 : PAGE_SIZE)
 struct vcs_poll_data {
        struct notifier_block notifier;
        unsigned int cons_num;
@@ -131,21 +132,45 @@ vcs_poll_data_get(struct file *file)
        return poll;
 }
+/*
+ * Returns VC for inode.
+ * Must be called with console_lock.
+ */
+static struct vc_data*
+vcs_vc(struct inode *inode, int *viewed)
+{
+        unsigned int currcons = iminor(inode) & 127;
+        WARN_CONSOLE_UNLOCKED();
+        if (currcons == 0) {
+                currcons = fg_console;
+                if (viewed)
+                        *viewed = 1;
+        } else {
+                currcons--;
+                if (viewed)
+                        *viewed = 0;
+        }
+        return vc_cons[currcons].d;
+}
+/*
+ * Returns size for VC carried by inode.
+ * Must be called with console_lock.
+ */
 static int
 vcs_size(struct inode *inode)
 {
        int size;
        int minor = iminor(inode);
-        int currcons = minor & 127;
        struct vc_data *vc;
-        if (currcons == 0)
+        WARN_CONSOLE_UNLOCKED();
-                currcons = fg_console;
-        else
+        vc = vcs_vc(inode, NULL);
-                currcons--;
+        if (!vc)
-        if (!vc_cons_allocated(currcons))
                return -ENXIO;
-        vc = vc_cons[currcons].d;
        size = vc->vc_rows * vc->vc_cols;
@@ -158,11 +183,13 @@ static loff_t vcs_lseek(struct file *file, loff_t offset, int orig)
 {
        int size;
-        mutex_lock(&con_buf_mtx);
+        console_lock();
        size = vcs_size(file->f_path.dentry->d_inode);
+        console_unlock();
+        if (size < 0)
+                return size;
        switch (orig) {
                default:
-                        mutex_unlock(&con_buf_mtx);
                        return -EINVAL;
                case 2:
                        offset += size;
@@ -173,11 +200,9 @@ static loff_t vcs_lseek(struct file *file, loff_t offset, int orig)
                        break;
        }
        if (offset < 0 || offset > size) {
-                mutex_unlock(&con_buf_mtx);
                return -EINVAL;
        }
        file->f_pos = offset;
-        mutex_unlock(&con_buf_mtx);
        return file->f_pos;
 }
@@ -190,12 +215,15 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
        struct vc_data *vc;
        struct vcs_poll_data *poll;
        long pos;
-        long viewed, attr, read;
+        long attr, read;
-        int col, maxcol;
+        int col, maxcol, viewed;
        unsigned short *org = NULL;
        ssize_t ret;
+        char *con_buf;
-        mutex_lock(&con_buf_mtx);
+        con_buf = (char *) __get_free_page(GFP_KERNEL);
+        if (!con_buf)
+                return -ENOMEM;
        pos = *ppos;
@@ -205,18 +233,10 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
        console_lock();
        attr = (currcons & 128);
-        currcons = (currcons & 127);
-        if (currcons == 0) {
-                currcons = fg_console;
-                viewed = 1;
-        } else {
-                currcons--;
-                viewed = 0;
-        }
        ret = -ENXIO;
-        if (!vc_cons_allocated(currcons))
+        vc = vcs_vc(inode, &viewed);
+        if (!vc)
                goto unlock_out;
-        vc = vc_cons[currcons].d;
        ret = -EINVAL;
        if (pos < 0)
@@ -237,6 +257,12 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
                 * could sleep.
                 */
                size = vcs_size(inode);
+                if (size < 0) {
+                        if (read)
+                                break;
+                        ret = size;
+                        goto unlock_out;
+                }
                if (pos >= size)
                        break;
                if (count > size - pos)
@@ -355,7 +381,7 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
                ret = read;
 unlock_out:
        console_unlock();
-        mutex_unlock(&con_buf_mtx);
+        free_page((unsigned long) con_buf);
        return ret;
 }
@@ -366,13 +392,16 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
        unsigned int currcons = iminor(inode);
        struct vc_data *vc;
        long pos;
-        long viewed, attr, size, written;
+        long attr, size, written;
        char *con_buf0;
-        int col, maxcol;
+        int col, maxcol, viewed;
        u16 *org0 = NULL, *org = NULL;
        size_t ret;
+        char *con_buf;
-        mutex_lock(&con_buf_mtx);
+        con_buf = (char *) __get_free_page(GFP_KERNEL);
+        if (!con_buf)
+                return -ENOMEM;
        pos = *ppos;
@@ -382,19 +411,10 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
        console_lock();
        attr = (currcons & 128);
-        currcons = (currcons & 127);
-        if (currcons == 0) {
-                currcons = fg_console;
-                viewed = 1;
-        } else {
-                currcons--;
-                viewed = 0;
-        }
        ret = -ENXIO;
-        if (!vc_cons_allocated(currcons))
+        vc = vcs_vc(inode, &viewed);
+        if (!vc)
                goto unlock_out;
-        vc = vc_cons[currcons].d;
        size = vcs_size(inode);
        ret = -EINVAL;
@@ -436,6 +456,12 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
                 * Return data written up to now on failure.
                 */
                size = vcs_size(inode);
+                if (size < 0) {
+                        if (written)
+                                break;
+                        ret = size;
+                        goto unlock_out;
+                }
                if (pos >= size)
                        break;
                if (this_round > size - pos)
@@ -543,9 +569,7 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
 unlock_out:
        console_unlock();
+        free_page((unsigned long) con_buf);
-        mutex_unlock(&con_buf_mtx);
        return ret;
 }
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 147ede3423df..798df6f89110 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -2068,18 +2068,6 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
        }
 }
-/* This is a temporary buffer used to prepare a tty console write
- * so that we can easily avoid touching user space while holding the
- * console spinlock.  It is allocated in con_init and is shared by
- * this code and the vc_screen read/write tty calls.
- *
- * We have to allocate this statically in the kernel data section
- * since console_init (and thus con_init) are called before any
- * kernel memory allocation is available.
- */
-char con_buf[CON_BUF_SIZE];
-DEFINE_MUTEX(con_buf_mtx);
 /* is_double_width() is based on the wcwidth() implementation by
 * Markus Kuhn -- 2007-05-26 (Unicode 5.0)
 * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
@@ -2157,10 +2145,10 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
        currcons = vc->vc_num;
        if (!vc_cons_allocated(currcons)) {
-            /* could this happen? */
+                /* could this happen? */
-                printk_once("con_write: tty %d not allocated\n", currcons+1);
+                pr_warn_once("con_write: tty %d not allocated\n", currcons+1);
-            console_unlock();
+                console_unlock();
-            return 0;
+                return 0;
        }
        himask = vc->vc_hi_font_mask;
@@ -2940,7 +2928,7 @@ static int __init con_init(void)
        gotoxy(vc, vc->vc_x, vc->vc_y);
        csi_J(vc, 0);
        update_screen(vc);
-        printk("Console: %s %s %dx%d",
+        pr_info("Console: %s %s %dx%d",
                vc->vc_can_do_color ? "colour" : "mono",
                display_desc, vc->vc_cols, vc->vc_rows);
        printable = 1;
@@ -3103,7 +3091,7 @@ static int bind_con_driver(const struct consw *csw, int first, int last,
                        clear_buffer_attributes(vc);
        }
-        printk("Console: switching ");
+        pr_info("Console: switching ");
        if (!deflt)
                printk("consoles %d-%d ", first+1, last+1);
        if (j >= 0) {
@@ -3809,7 +3797,8 @@ void do_unblank_screen(int leaving_gfx)
                return;
        if (!vc_cons_allocated(fg_console)) {
                /* impossible */
-                printk("unblank_screen: tty %d not allocated ??\n", fg_console+1);
+                pr_warning("unblank_screen: tty %d not allocated ??\n",
+                           fg_console+1);
                return;
        }
        vc = vc_cons[fg_console].d;
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index 1235ebda6e1c..b64804965316 100644
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -495,7 +495,7 @@ do_unimap_ioctl(int cmd, struct unimapdesc __user *user_ud, int perm, struct vc_
 * We handle the console-specific ioctl's here.  We allow the
 * capability to modify any console, not just the fg_console. 
 */
-int vt_ioctl(struct tty_struct *tty, struct file * file,
+int vt_ioctl(struct tty_struct *tty,
             unsigned int cmd, unsigned long arg)
 {
        struct vc_data *vc = tty->driver_data;
@@ -688,6 +688,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                        kbd->kbdmode = VC_UNICODE;
                        compute_shiftstate();
                        break;
+                  case K_OFF:
+                        kbd->kbdmode = VC_OFF;
+                        break;
                  default:
                        ret = -EINVAL;
                        goto out;
@@ -1007,8 +1010,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                        if (ret)
                                break;
                        /* Commence switch and lock */
-                        set_console(arg);
+                        set_console(vsa.console);
                }
+                break;
        }
        /*
@@ -1491,7 +1495,7 @@ compat_unimap_ioctl(unsigned int cmd, struct compat_unimapdesc __user *user_ud,
        return 0;
 }
-long vt_compat_ioctl(struct tty_struct *tty, struct file * file,
+long vt_compat_ioctl(struct tty_struct *tty,
             unsigned int cmd, unsigned long arg)
 {
        struct vc_data *vc = tty->driver_data;
@@ -1577,7 +1581,7 @@ out:
 fallback:
        tty_unlock();
-        return vt_ioctl(tty, file, cmd, arg);
+        return vt_ioctl(tty, cmd, arg);
 }
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 4ab49d4eebf4..f492a7f2b6ee 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -776,7 +776,7 @@ static int acm_tty_break_ctl(struct tty_struct *tty, int state)
        return retval;
 }
-static int acm_tty_tiocmget(struct tty_struct *tty, struct file *file)
+static int acm_tty_tiocmget(struct tty_struct *tty)
 {
        struct acm *acm = tty->driver_data;
@@ -791,7 +791,7 @@ static int acm_tty_tiocmget(struct tty_struct *tty, struct file *file)
               TIOCM_CTS;
 }
-static int acm_tty_tiocmset(struct tty_struct *tty, struct file *file,
+static int acm_tty_tiocmset(struct tty_struct *tty,
                            unsigned int set, unsigned int clear)
 {
        struct acm *acm = tty->driver_data;
@@ -813,7 +813,7 @@ static int acm_tty_tiocmset(struct tty_struct *tty, struct file *file,
        return acm_set_control(acm, acm->ctrlout = newctrl);
 }
-static int acm_tty_ioctl(struct tty_struct *tty, struct file *file,
+static int acm_tty_ioctl(struct tty_struct *tty,
                                        unsigned int cmd, unsigned long arg)
 {
        struct acm *acm = tty->driver_data;
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
index 8f1d4fb19d24..5cdb9d912275 100644
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -431,7 +431,7 @@ static int ark3116_get_icount(struct tty_struct *tty,
        return 0;
 }
-static int ark3116_ioctl(struct tty_struct *tty, struct file *file,
+static int ark3116_ioctl(struct tty_struct *tty,
                         unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -485,7 +485,7 @@ static int ark3116_ioctl(struct tty_struct *tty, struct file *file,
        return -ENOIOCTLCMD;
 }
-static int ark3116_tiocmget(struct tty_struct *tty, struct file *file)
+static int ark3116_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct ark3116_private *priv = usb_get_serial_port_data(port);
@@ -511,7 +511,7 @@ static int ark3116_tiocmget(struct tty_struct *tty, struct file *file)
                (ctrl   & UART_MCR_OUT2 ? TIOCM_OUT2 : 0);
 }
-static int ark3116_tiocmset(struct tty_struct *tty, struct file *file,
+static int ark3116_tiocmset(struct tty_struct *tty,
                        unsigned set, unsigned clr)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index 36df35295db2..d6921fa1403c 100644
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -100,8 +100,8 @@ static void belkin_sa_process_read_urb(struct urb *urb);
 static void belkin_sa_set_termios(struct tty_struct *tty,
                        struct usb_serial_port *port, struct ktermios * old);
 static void belkin_sa_break_ctl(struct tty_struct *tty, int break_state);
-static int  belkin_sa_tiocmget(struct tty_struct *tty, struct file *file);
+static int  belkin_sa_tiocmget(struct tty_struct *tty);
-static int  belkin_sa_tiocmset(struct tty_struct *tty, struct file *file,
+static int  belkin_sa_tiocmset(struct tty_struct *tty,
                                        unsigned int set, unsigned int clear);
@@ -497,7 +497,7 @@ static void belkin_sa_break_ctl(struct tty_struct *tty, int break_state)
                dev_err(&port->dev, "Set break_ctl %d\n", break_state);
 }
-static int belkin_sa_tiocmget(struct tty_struct *tty, struct file *file)
+static int belkin_sa_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct belkin_sa_private *priv = usb_get_serial_port_data(port);
@@ -513,7 +513,7 @@ static int belkin_sa_tiocmget(struct tty_struct *tty, struct file *file)
        return control_state;
 }
-static int belkin_sa_tiocmset(struct tty_struct *tty, struct file *file,
+static int belkin_sa_tiocmset(struct tty_struct *tty,
                               unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index 7b8815ddf368..d0b9feac5dc3 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -431,7 +431,7 @@ out:
        kfree(break_reg);
 }
-static int ch341_tiocmset(struct tty_struct *tty, struct file *file,
+static int ch341_tiocmset(struct tty_struct *tty,
                          unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -552,8 +552,7 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg)
        return 0;
 }
-/*static int ch341_ioctl(struct usb_serial_port *port, struct file *file,*/
+static int ch341_ioctl(struct tty_struct *tty,
-static int ch341_ioctl(struct tty_struct *tty, struct file *file,
                        unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -572,7 +571,7 @@ static int ch341_ioctl(struct tty_struct *tty, struct file *file,
        return -ENOIOCTLCMD;
 }
-static int ch341_tiocmget(struct tty_struct *tty, struct file *file)
+static int ch341_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct ch341_private *priv = usb_get_serial_port_data(port);
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 735ea03157ab..4df3e0cecbae 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -41,10 +41,9 @@ static void cp210x_get_termios_port(struct usb_serial_port *port,
        unsigned int *cflagp, unsigned int *baudp);
 static void cp210x_set_termios(struct tty_struct *, struct usb_serial_port *,
                                                        struct ktermios*);
-static int cp210x_tiocmget(struct tty_struct *, struct file *);
+static int cp210x_tiocmget(struct tty_struct *);
-static int cp210x_tiocmset(struct tty_struct *, struct file *,
+static int cp210x_tiocmset(struct tty_struct *, unsigned int, unsigned int);
-                unsigned int, unsigned int);
+static int cp210x_tiocmset_port(struct usb_serial_port *port,
-static int cp210x_tiocmset_port(struct usb_serial_port *port, struct file *,
                unsigned int, unsigned int);
 static void cp210x_break_ctl(struct tty_struct *, int);
 static int cp210x_startup(struct usb_serial *);
@@ -698,14 +697,14 @@ static void cp210x_set_termios(struct tty_struct *tty,
 }
-static int cp210x_tiocmset (struct tty_struct *tty, struct file *file,
+static int cp210x_tiocmset (struct tty_struct *tty,
                unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
-        return cp210x_tiocmset_port(port, file, set, clear);
+        return cp210x_tiocmset_port(port, set, clear);
 }
-static int cp210x_tiocmset_port(struct usb_serial_port *port, struct file *file,
+static int cp210x_tiocmset_port(struct usb_serial_port *port,
                unsigned int set, unsigned int clear)
 {
        unsigned int control = 0;
@@ -737,12 +736,12 @@ static int cp210x_tiocmset_port(struct usb_serial_port *port, struct file *file,
 static void cp210x_dtr_rts(struct usb_serial_port *p, int on)
 {
        if (on)
-                cp210x_tiocmset_port(p, NULL,  TIOCM_DTR|TIOCM_RTS, 0);
+                cp210x_tiocmset_port(p, TIOCM_DTR|TIOCM_RTS, 0);
        else
-                cp210x_tiocmset_port(p, NULL,  0, TIOCM_DTR|TIOCM_RTS);
+                cp210x_tiocmset_port(p, 0, TIOCM_DTR|TIOCM_RTS);
 }
-static int cp210x_tiocmget (struct tty_struct *tty, struct file *file)
+static int cp210x_tiocmget (struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        unsigned int control;
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 2edf238b00b9..987e9bf7bd02 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -169,12 +169,12 @@ static int  cypress_write(struct tty_struct *tty, struct usb_serial_port *port,
                        const unsigned char *buf, int count);
 static void cypress_send(struct usb_serial_port *port);
 static int  cypress_write_room(struct tty_struct *tty);
-static int  cypress_ioctl(struct tty_struct *tty, struct file *file,
+static int  cypress_ioctl(struct tty_struct *tty,
                        unsigned int cmd, unsigned long arg);
 static void cypress_set_termios(struct tty_struct *tty,
                        struct usb_serial_port *port, struct ktermios *old);
-static int  cypress_tiocmget(struct tty_struct *tty, struct file *file);
+static int  cypress_tiocmget(struct tty_struct *tty);
-static int  cypress_tiocmset(struct tty_struct *tty, struct file *file,
+static int  cypress_tiocmset(struct tty_struct *tty,
                        unsigned int set, unsigned int clear);
 static int  cypress_chars_in_buffer(struct tty_struct *tty);
 static void cypress_throttle(struct tty_struct *tty);
@@ -864,7 +864,7 @@ static int cypress_write_room(struct tty_struct *tty)
 }
-static int cypress_tiocmget(struct tty_struct *tty, struct file *file)
+static int cypress_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct cypress_private *priv = usb_get_serial_port_data(port);
@@ -892,7 +892,7 @@ static int cypress_tiocmget(struct tty_struct *tty, struct file *file)
 }
-static int cypress_tiocmset(struct tty_struct *tty, struct file *file,
+static int cypress_tiocmset(struct tty_struct *tty,
                               unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -917,7 +917,7 @@ static int cypress_tiocmset(struct tty_struct *tty, struct file *file,
 }
-static int cypress_ioctl(struct tty_struct *tty, struct file *file,
+static int cypress_ioctl(struct tty_struct *tty,
                                        unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 666e5a6edd82..86fbba6336c9 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -445,11 +445,11 @@ static void digi_rx_unthrottle(struct tty_struct *tty);
 static void digi_set_termios(struct tty_struct *tty,
                struct usb_serial_port *port, struct ktermios *old_termios);
 static void digi_break_ctl(struct tty_struct *tty, int break_state);
-static int digi_tiocmget(struct tty_struct *tty, struct file *file);
+static int digi_tiocmget(struct tty_struct *tty);
-static int digi_tiocmset(struct tty_struct *tty, struct file *file,
+static int digi_tiocmset(struct tty_struct *tty, unsigned int set,
-        unsigned int set, unsigned int clear);
+                unsigned int clear);
 static int digi_write(struct tty_struct *tty, struct usb_serial_port *port,
-        const unsigned char *buf, int count);
+                const unsigned char *buf, int count);
 static void digi_write_bulk_callback(struct urb *urb);
 static int digi_write_room(struct tty_struct *tty);
 static int digi_chars_in_buffer(struct tty_struct *tty);
@@ -1118,7 +1118,7 @@ static void digi_break_ctl(struct tty_struct *tty, int break_state)
 }
-static int digi_tiocmget(struct tty_struct *tty, struct file *file)
+static int digi_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct digi_port *priv = usb_get_serial_port_data(port);
@@ -1134,8 +1134,8 @@ static int digi_tiocmget(struct tty_struct *tty, struct file *file)
 }
-static int digi_tiocmset(struct tty_struct *tty, struct file *file,
+static int digi_tiocmset(struct tty_struct *tty,
-        unsigned int set, unsigned int clear)
+                                        unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct digi_port *priv = usb_get_serial_port_data(port);
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index f349a3629d00..997326ea15bd 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -864,10 +864,10 @@ static int ftdi_prepare_write_buffer(struct usb_serial_port *port,
                                                void *dest, size_t size);
 static void ftdi_set_termios(struct tty_struct *tty,
                        struct usb_serial_port *port, struct ktermios *old);
-static int  ftdi_tiocmget(struct tty_struct *tty, struct file *file);
+static int  ftdi_tiocmget(struct tty_struct *tty);
-static int  ftdi_tiocmset(struct tty_struct *tty, struct file *file,
+static int  ftdi_tiocmset(struct tty_struct *tty,
                        unsigned int set, unsigned int clear);
-static int  ftdi_ioctl(struct tty_struct *tty, struct file *file,
+static int  ftdi_ioctl(struct tty_struct *tty,
                        unsigned int cmd, unsigned long arg);
 static void ftdi_break_ctl(struct tty_struct *tty, int break_state);
@@ -2176,7 +2176,7 @@ static void ftdi_set_termios(struct tty_struct *tty,
        }
 }
-static int ftdi_tiocmget(struct tty_struct *tty, struct file *file)
+static int ftdi_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct ftdi_private *priv = usb_get_serial_port_data(port);
@@ -2229,7 +2229,7 @@ out:
        return ret;
 }
-static int ftdi_tiocmset(struct tty_struct *tty, struct file *file,
+static int ftdi_tiocmset(struct tty_struct *tty,
                        unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -2237,7 +2237,7 @@ static int ftdi_tiocmset(struct tty_struct *tty, struct file *file,
        return update_mctrl(port, set, clear);
 }
-static int ftdi_ioctl(struct tty_struct *tty, struct file *file,
+static int ftdi_ioctl(struct tty_struct *tty,
                                        unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index 3b246d93cf22..c675a326023f 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -216,11 +216,11 @@ static void edge_unthrottle(struct tty_struct *tty);
 static void edge_set_termios(struct tty_struct *tty,
                                        struct usb_serial_port *port,
                                        struct ktermios *old_termios);
-static int  edge_ioctl(struct tty_struct *tty, struct file *file,
+static int  edge_ioctl(struct tty_struct *tty,
                                        unsigned int cmd, unsigned long arg);
 static void edge_break(struct tty_struct *tty, int break_state);
-static int  edge_tiocmget(struct tty_struct *tty, struct file *file);
+static int  edge_tiocmget(struct tty_struct *tty);
-static int  edge_tiocmset(struct tty_struct *tty, struct file *file,
+static int  edge_tiocmset(struct tty_struct *tty,
                                        unsigned int set, unsigned int clear);
 static int  edge_get_icount(struct tty_struct *tty,
                                struct serial_icounter_struct *icount);
@@ -1568,7 +1568,7 @@ static int get_lsr_info(struct edgeport_port *edge_port,
        return 0;
 }
-static int edge_tiocmset(struct tty_struct *tty, struct file *file,
+static int edge_tiocmset(struct tty_struct *tty,
                                        unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -1599,7 +1599,7 @@ static int edge_tiocmset(struct tty_struct *tty, struct file *file,
        return 0;
 }
-static int edge_tiocmget(struct tty_struct *tty, struct file *file)
+static int edge_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct edgeport_port *edge_port = usb_get_serial_port_data(port);
@@ -1679,7 +1679,7 @@ static int get_serial_info(struct edgeport_port *edge_port,
 * SerialIoctl
 *      this function handles any ioctl calls to the driver
 *****************************************************************************/
-static int edge_ioctl(struct tty_struct *tty, struct file *file,
+static int edge_ioctl(struct tty_struct *tty,
                                        unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 22506b095c4f..d8434910fa7b 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -2444,7 +2444,7 @@ static void edge_set_termios(struct tty_struct *tty,
        change_port_settings(tty, edge_port, old_termios);
 }
-static int edge_tiocmset(struct tty_struct *tty, struct file *file,
+static int edge_tiocmset(struct tty_struct *tty,
                                        unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -2477,7 +2477,7 @@ static int edge_tiocmset(struct tty_struct *tty, struct file *file,
        return 0;
 }
-static int edge_tiocmget(struct tty_struct *tty, struct file *file)
+static int edge_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct edgeport_port *edge_port = usb_get_serial_port_data(port);
@@ -2552,7 +2552,7 @@ static int get_serial_info(struct edgeport_port *edge_port,
        return 0;
 }
-static int edge_ioctl(struct tty_struct *tty, struct file *file,
+static int edge_ioctl(struct tty_struct *tty,
                                        unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index 99b97c04896f..6aca631a407a 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -150,7 +150,7 @@ static void iuu_release(struct usb_serial *serial)
        }
 }
-static int iuu_tiocmset(struct tty_struct *tty, struct file *file,
+static int iuu_tiocmset(struct tty_struct *tty,
                        unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -179,7 +179,7 @@ static int iuu_tiocmset(struct tty_struct *tty, struct file *file,
 * When no card , the reader respond with TIOCM_CD
 * This is known as CD autodetect mechanism
 */
-static int iuu_tiocmget(struct tty_struct *tty, struct file *file)
+static int iuu_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct iuu_private *priv = usb_get_serial_port_data(port);
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 0791778a66f3..c6e968f24e04 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -301,7 +301,7 @@ static void keyspan_set_termios(struct tty_struct *tty,
        keyspan_send_setup(port, 0);
 }
-static int keyspan_tiocmget(struct tty_struct *tty, struct file *file)
+static int keyspan_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct keyspan_port_private *p_priv = usb_get_serial_port_data(port);
@@ -317,7 +317,7 @@ static int keyspan_tiocmget(struct tty_struct *tty, struct file *file)
        return value;
 }
-static int keyspan_tiocmset(struct tty_struct *tty, struct file *file,
+static int keyspan_tiocmset(struct tty_struct *tty,
                            unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index ce134dc28ddf..13fa1d1cc900 100644
--- a/drivers/usb/serial/keyspan.h
+++ b/drivers/usb/serial/keyspan.h
@@ -58,10 +58,9 @@ static void keyspan_set_termios		(struct tty_struct *tty,
                                         struct ktermios *old);
 static void keyspan_break_ctl           (struct tty_struct *tty,
                                         int break_state);
-static int  keyspan_tiocmget            (struct tty_struct *tty,
+static int  keyspan_tiocmget            (struct tty_struct *tty);
-                                         struct file *file);
 static int  keyspan_tiocmset            (struct tty_struct *tty,
-                                         struct file *file, unsigned int set,
+                                         unsigned int set,
                                         unsigned int clear);
 static int  keyspan_fake_startup        (struct usb_serial *serial);
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 554a8693a463..207caabdc4ff 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -457,7 +457,7 @@ static int keyspan_pda_set_modem_info(struct usb_serial *serial,
        return rc;
 }
-static int keyspan_pda_tiocmget(struct tty_struct *tty, struct file *file)
+static int keyspan_pda_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct usb_serial *serial = port->serial;
@@ -478,7 +478,7 @@ static int keyspan_pda_tiocmget(struct tty_struct *tty, struct file *file)
        return value;
 }
-static int keyspan_pda_tiocmset(struct tty_struct *tty, struct file *file,
+static int keyspan_pda_tiocmset(struct tty_struct *tty,
                                unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index e8a65ce45a2f..19373cb7c5bf 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -68,8 +68,8 @@ static int  klsi_105_open(struct tty_struct *tty, struct usb_serial_port *port);
 static void klsi_105_close(struct usb_serial_port *port);
 static void klsi_105_set_termios(struct tty_struct *tty,
                        struct usb_serial_port *port, struct ktermios *old);
-static int  klsi_105_tiocmget(struct tty_struct *tty, struct file *file);
+static int  klsi_105_tiocmget(struct tty_struct *tty);
-static int  klsi_105_tiocmset(struct tty_struct *tty, struct file *file,
+static int  klsi_105_tiocmset(struct tty_struct *tty,
                        unsigned int set, unsigned int clear);
 static void klsi_105_process_read_urb(struct urb *urb);
 static int klsi_105_prepare_write_buffer(struct usb_serial_port *port,
@@ -637,7 +637,7 @@ static void mct_u232_break_ctl(struct tty_struct *tty, int break_state)
 }
 #endif
-static int klsi_105_tiocmget(struct tty_struct *tty, struct file *file)
+static int klsi_105_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct klsi_105_private *priv = usb_get_serial_port_data(port);
@@ -661,7 +661,7 @@ static int klsi_105_tiocmget(struct tty_struct *tty, struct file *file)
        return (int)line_state;
 }
-static int klsi_105_tiocmset(struct tty_struct *tty, struct file *file,
+static int klsi_105_tiocmset(struct tty_struct *tty,
                             unsigned int set, unsigned int clear)
 {
        int retval = -EINVAL;
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index bd5bd8589e04..667863ef0625 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -75,10 +75,10 @@ static void kobil_close(struct usb_serial_port *port);
 static int  kobil_write(struct tty_struct *tty, struct usb_serial_port *port,
                         const unsigned char *buf, int count);
 static int  kobil_write_room(struct tty_struct *tty);
-static int  kobil_ioctl(struct tty_struct *tty, struct file *file,
+static int  kobil_ioctl(struct tty_struct *tty,
                        unsigned int cmd, unsigned long arg);
-static int  kobil_tiocmget(struct tty_struct *tty, struct file *file);
+static int  kobil_tiocmget(struct tty_struct *tty);
-static int  kobil_tiocmset(struct tty_struct *tty, struct file *file,
+static int  kobil_tiocmset(struct tty_struct *tty,
                           unsigned int set, unsigned int clear);
 static void kobil_read_int_callback(struct urb *urb);
 static void kobil_write_callback(struct urb *purb);
@@ -504,7 +504,7 @@ static int kobil_write_room(struct tty_struct *tty)
 }
-static int kobil_tiocmget(struct tty_struct *tty, struct file *file)
+static int kobil_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct kobil_private *priv;
@@ -544,7 +544,7 @@ static int kobil_tiocmget(struct tty_struct *tty, struct file *file)
        return result;
 }
-static int kobil_tiocmset(struct tty_struct *tty, struct file *file,
+static int kobil_tiocmset(struct tty_struct *tty,
                           unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -668,7 +668,7 @@ static void kobil_set_termios(struct tty_struct *tty,
                );
 }
-static int kobil_ioctl(struct tty_struct *tty, struct file *file,
+static int kobil_ioctl(struct tty_struct *tty,
                                        unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 2849f8c32015..ef49902c5a51 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -101,8 +101,8 @@ static void mct_u232_read_int_callback(struct urb *urb);
 static void mct_u232_set_termios(struct tty_struct *tty,
                        struct usb_serial_port *port, struct ktermios *old);
 static void mct_u232_break_ctl(struct tty_struct *tty, int break_state);
-static int  mct_u232_tiocmget(struct tty_struct *tty, struct file *file);
+static int  mct_u232_tiocmget(struct tty_struct *tty);
-static int  mct_u232_tiocmset(struct tty_struct *tty, struct file *file,
+static int  mct_u232_tiocmset(struct tty_struct *tty,
                        unsigned int set, unsigned int clear);
 static void mct_u232_throttle(struct tty_struct *tty);
 static void mct_u232_unthrottle(struct tty_struct *tty);
@@ -762,7 +762,7 @@ static void mct_u232_break_ctl(struct tty_struct *tty, int break_state)
 } /* mct_u232_break_ctl */
-static int mct_u232_tiocmget(struct tty_struct *tty, struct file *file)
+static int mct_u232_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct mct_u232_private *priv = usb_get_serial_port_data(port);
@@ -778,7 +778,7 @@ static int mct_u232_tiocmget(struct tty_struct *tty, struct file *file)
        return control_state;
 }
-static int mct_u232_tiocmset(struct tty_struct *tty, struct file *file,
+static int mct_u232_tiocmset(struct tty_struct *tty,
                              unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 7d3bc9a3e2b6..d8b3e8fa14e9 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -1833,7 +1833,7 @@ static int get_lsr_info(struct tty_struct *tty,
        return 0;
 }
-static int mos7720_tiocmget(struct tty_struct *tty, struct file *file)
+static int mos7720_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct moschip_port *mos7720_port = usb_get_serial_port_data(port);
@@ -1858,14 +1858,14 @@ static int mos7720_tiocmget(struct tty_struct *tty, struct file *file)
        return result;
 }
-static int mos7720_tiocmset(struct tty_struct *tty, struct file *file,
+static int mos7720_tiocmset(struct tty_struct *tty,
                            unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct moschip_port *mos7720_port = usb_get_serial_port_data(port);
        unsigned int mcr ;
        dbg("%s - port %d", __func__, port->number);
-        dbg("he was at tiocmget");
+        dbg("he was at tiocmset");
        mcr = mos7720_port->shadowMCR;
@@ -1987,7 +1987,7 @@ static int get_serial_info(struct moschip_port *mos7720_port,
        return 0;
 }
-static int mos7720_ioctl(struct tty_struct *tty, struct file *file,
+static int mos7720_ioctl(struct tty_struct *tty,
                         unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 5627993f9e41..7b50aa122752 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1644,7 +1644,7 @@ static void mos7840_unthrottle(struct tty_struct *tty)
        }
 }
-static int mos7840_tiocmget(struct tty_struct *tty, struct file *file)
+static int mos7840_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct moschip_port *mos7840_port;
@@ -1674,7 +1674,7 @@ static int mos7840_tiocmget(struct tty_struct *tty, struct file *file)
        return result;
 }
-static int mos7840_tiocmset(struct tty_struct *tty, struct file *file,
+static int mos7840_tiocmset(struct tty_struct *tty,
                            unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -2235,7 +2235,7 @@ static int mos7840_get_icount(struct tty_struct *tty,
 *      this function handles any ioctl calls to the driver
 *****************************************************************************/
-static int mos7840_ioctl(struct tty_struct *tty, struct file *file,
+static int mos7840_ioctl(struct tty_struct *tty,
                         unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index eda1f9266c4e..8d603a1ca2eb 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -352,7 +352,7 @@ static void opticon_unthrottle(struct tty_struct *tty)
        }
 }
-static int opticon_tiocmget(struct tty_struct *tty, struct file *file)
+static int opticon_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct opticon_private *priv = usb_get_serial_data(port->serial);
@@ -396,7 +396,7 @@ static int get_serial_info(struct opticon_private *priv,
        return 0;
 }
-static int opticon_ioctl(struct tty_struct *tty, struct file *file,
+static int opticon_ioctl(struct tty_struct *tty,
                         unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index 73613205be7a..4c29e6c2bda7 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -135,7 +135,7 @@ static void oti6858_close(struct usb_serial_port *port);
 static void oti6858_set_termios(struct tty_struct *tty,
                        struct usb_serial_port *port, struct ktermios *old);
 static void oti6858_init_termios(struct tty_struct *tty);
-static int oti6858_ioctl(struct tty_struct *tty, struct file *file,
+static int oti6858_ioctl(struct tty_struct *tty,
                        unsigned int cmd, unsigned long arg);
 static void oti6858_read_int_callback(struct urb *urb);
 static void oti6858_read_bulk_callback(struct urb *urb);
@@ -144,8 +144,8 @@ static int oti6858_write(struct tty_struct *tty, struct usb_serial_port *port,
                        const unsigned char *buf, int count);
 static int oti6858_write_room(struct tty_struct *tty);
 static int oti6858_chars_in_buffer(struct tty_struct *tty);
-static int oti6858_tiocmget(struct tty_struct *tty, struct file *file);
+static int oti6858_tiocmget(struct tty_struct *tty);
-static int oti6858_tiocmset(struct tty_struct *tty, struct file *file,
+static int oti6858_tiocmset(struct tty_struct *tty,
                                unsigned int set, unsigned int clear);
 static int oti6858_startup(struct usb_serial *serial);
 static void oti6858_release(struct usb_serial *serial);
@@ -624,7 +624,7 @@ static void oti6858_close(struct usb_serial_port *port)
        usb_kill_urb(port->interrupt_in_urb);
 }
-static int oti6858_tiocmset(struct tty_struct *tty, struct file *file,
+static int oti6858_tiocmset(struct tty_struct *tty,
                                unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -657,7 +657,7 @@ static int oti6858_tiocmset(struct tty_struct *tty, struct file *file,
        return 0;
 }
-static int oti6858_tiocmget(struct tty_struct *tty, struct file *file)
+static int oti6858_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct oti6858_private *priv = usb_get_serial_port_data(port);
@@ -728,7 +728,7 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg)
        return 0;
 }
-static int oti6858_ioctl(struct tty_struct *tty, struct file *file,
+static int oti6858_ioctl(struct tty_struct *tty,
                        unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 08c9181b8e48..30461fcc2206 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -505,7 +505,7 @@ static int pl2303_open(struct tty_struct *tty, struct usb_serial_port *port)
        return 0;
 }
-static int pl2303_tiocmset(struct tty_struct *tty, struct file *file,
+static int pl2303_tiocmset(struct tty_struct *tty,
                           unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -531,7 +531,7 @@ static int pl2303_tiocmset(struct tty_struct *tty, struct file *file,
        return set_control_lines(port->serial->dev, control);
 }
-static int pl2303_tiocmget(struct tty_struct *tty, struct file *file)
+static int pl2303_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct pl2303_private *priv = usb_get_serial_port_data(port);
@@ -606,7 +606,7 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg)
        return 0;
 }
-static int pl2303_ioctl(struct tty_struct *tty, struct file *file,
+static int pl2303_ioctl(struct tty_struct *tty,
                        unsigned int cmd, unsigned long arg)
 {
        struct serial_struct ser;
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 7481ff8a49e4..79ee6c79ad54 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -389,7 +389,7 @@ static void sierra_set_termios(struct tty_struct *tty,
        sierra_send_setup(port);
 }
-static int sierra_tiocmget(struct tty_struct *tty, struct file *file)
+static int sierra_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        unsigned int value;
@@ -408,7 +408,7 @@ static int sierra_tiocmget(struct tty_struct *tty, struct file *file)
        return value;
 }
-static int sierra_tiocmset(struct tty_struct *tty, struct file *file,
+static int sierra_tiocmset(struct tty_struct *tty,
                        unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index cbfb70bffdd0..180ea6c7911c 100644
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -576,7 +576,7 @@ static int spcp8x5_wait_modem_info(struct usb_serial_port *port,
        return 0;
 }
-static int spcp8x5_ioctl(struct tty_struct *tty, struct file *file,
+static int spcp8x5_ioctl(struct tty_struct *tty,
                         unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -595,7 +595,7 @@ static int spcp8x5_ioctl(struct tty_struct *tty, struct file *file,
        return -ENOIOCTLCMD;
 }
-static int spcp8x5_tiocmset(struct tty_struct *tty, struct file *file,
+static int spcp8x5_tiocmset(struct tty_struct *tty,
                            unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -618,7 +618,7 @@ static int spcp8x5_tiocmset(struct tty_struct *tty, struct file *file,
        return spcp8x5_set_ctrlLine(port->serial->dev, control , priv->type);
 }
-static int spcp8x5_tiocmget(struct tty_struct *tty, struct file *file)
+static int spcp8x5_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct spcp8x5_private *priv = usb_get_serial_port_data(port);
diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c
index 8359ec798959..87362e48796e 100644
--- a/drivers/usb/serial/ssu100.c
+++ b/drivers/usb/serial/ssu100.c
@@ -439,7 +439,7 @@ static int ssu100_get_icount(struct tty_struct *tty,
-static int ssu100_ioctl(struct tty_struct *tty, struct file *file,
+static int ssu100_ioctl(struct tty_struct *tty,
                    unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -484,7 +484,7 @@ static int ssu100_attach(struct usb_serial *serial)
        return ssu100_initdevice(serial->dev);
 }
-static int ssu100_tiocmget(struct tty_struct *tty, struct file *file)
+static int ssu100_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct usb_device *dev = port->serial->dev;
@@ -517,7 +517,7 @@ mget_out:
        return r;
 }
-static int ssu100_tiocmset(struct tty_struct *tty, struct file *file,
+static int ssu100_tiocmset(struct tty_struct *tty,
                           unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index a910004f4079..c6d92a530086 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -106,14 +106,14 @@ static int ti_write_room(struct tty_struct *tty);
 static int ti_chars_in_buffer(struct tty_struct *tty);
 static void ti_throttle(struct tty_struct *tty);
 static void ti_unthrottle(struct tty_struct *tty);
-static int ti_ioctl(struct tty_struct *tty, struct file *file,
+static int ti_ioctl(struct tty_struct *tty,
                unsigned int cmd, unsigned long arg);
 static int ti_get_icount(struct tty_struct *tty,
                struct serial_icounter_struct *icount);
 static void ti_set_termios(struct tty_struct *tty,
                struct usb_serial_port *port, struct ktermios *old_termios);
-static int ti_tiocmget(struct tty_struct *tty, struct file *file);
+static int ti_tiocmget(struct tty_struct *tty);
-static int ti_tiocmset(struct tty_struct *tty, struct file *file,
+static int ti_tiocmset(struct tty_struct *tty,
                unsigned int set, unsigned int clear);
 static void ti_break(struct tty_struct *tty, int break_state);
 static void ti_interrupt_callback(struct urb *urb);
@@ -818,7 +818,7 @@ static int ti_get_icount(struct tty_struct *tty,
        return 0;
 }
-static int ti_ioctl(struct tty_struct *tty, struct file *file,
+static int ti_ioctl(struct tty_struct *tty,
        unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -1000,7 +1000,7 @@ static void ti_set_termios(struct tty_struct *tty,
 }
-static int ti_tiocmget(struct tty_struct *tty, struct file *file)
+static int ti_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct ti_port *tport = usb_get_serial_port_data(port);
@@ -1033,8 +1033,8 @@ static int ti_tiocmget(struct tty_struct *tty, struct file *file)
 }
-static int ti_tiocmset(struct tty_struct *tty, struct file *file,
+static int ti_tiocmset(struct tty_struct *tty,
-        unsigned int set, unsigned int clear)
+                                unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct ti_port *tport = usb_get_serial_port_data(port);
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 546a52179bec..a72575349744 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -406,7 +406,7 @@ static void serial_unthrottle(struct tty_struct *tty)
                port->serial->type->unthrottle(tty);
 }
-static int serial_ioctl(struct tty_struct *tty, struct file *file,
+static int serial_ioctl(struct tty_struct *tty,
                                        unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -417,7 +417,7 @@ static int serial_ioctl(struct tty_struct *tty, struct file *file,
        /* pass on to the driver specific version of this function
           if it is available */
        if (port->serial->type->ioctl) {
-                retval = port->serial->type->ioctl(tty, file, cmd, arg);
+                retval = port->serial->type->ioctl(tty, cmd, arg);
        } else
                retval = -ENOIOCTLCMD;
        return retval;
@@ -496,18 +496,18 @@ static const struct file_operations serial_proc_fops = {
        .release        = single_release,
 };
-static int serial_tiocmget(struct tty_struct *tty, struct file *file)
+static int serial_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        dbg("%s - port %d", __func__, port->number);
        if (port->serial->type->tiocmget)
-                return port->serial->type->tiocmget(tty, file);
+                return port->serial->type->tiocmget(tty);
        return -EINVAL;
 }
-static int serial_tiocmset(struct tty_struct *tty, struct file *file,
+static int serial_tiocmset(struct tty_struct *tty,
                            unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -515,7 +515,7 @@ static int serial_tiocmset(struct tty_struct *tty, struct file *file,
        dbg("%s - port %d", __func__, port->number);
        if (port->serial->type->tiocmset)
-                return port->serial->type->tiocmset(tty, file, set, clear);
+                return port->serial->type->tiocmset(tty, set, clear);
        return -EINVAL;
 }
diff --git a/drivers/usb/serial/usb-wwan.h b/drivers/usb/serial/usb-wwan.h
index 3ab77c5d9819..c47b6ec03063 100644
--- a/drivers/usb/serial/usb-wwan.h
+++ b/drivers/usb/serial/usb-wwan.h
@@ -15,10 +15,10 @@ extern int usb_wwan_write_room(struct tty_struct *tty);
 extern void usb_wwan_set_termios(struct tty_struct *tty,
                                 struct usb_serial_port *port,
                                 struct ktermios *old);
-extern int usb_wwan_tiocmget(struct tty_struct *tty, struct file *file);
+extern int usb_wwan_tiocmget(struct tty_struct *tty);
-extern int usb_wwan_tiocmset(struct tty_struct *tty, struct file *file,
+extern int usb_wwan_tiocmset(struct tty_struct *tty,
                             unsigned int set, unsigned int clear);
-extern int usb_wwan_ioctl(struct tty_struct *tty, struct file *file,
+extern int usb_wwan_ioctl(struct tty_struct *tty,
                          unsigned int cmd, unsigned long arg);
 extern int usb_wwan_send_setup(struct usb_serial_port *port);
 extern int usb_wwan_write(struct tty_struct *tty, struct usb_serial_port *port,
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index b004b2a485c3..b38d77b389d4 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -79,7 +79,7 @@ void usb_wwan_set_termios(struct tty_struct *tty,
 }
 EXPORT_SYMBOL(usb_wwan_set_termios);
-int usb_wwan_tiocmget(struct tty_struct *tty, struct file *file)
+int usb_wwan_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        unsigned int value;
@@ -98,7 +98,7 @@ int usb_wwan_tiocmget(struct tty_struct *tty, struct file *file)
 }
 EXPORT_SYMBOL(usb_wwan_tiocmget);
-int usb_wwan_tiocmset(struct tty_struct *tty, struct file *file,
+int usb_wwan_tiocmset(struct tty_struct *tty,
                      unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -178,7 +178,7 @@ static int set_serial_info(struct usb_serial_port *port,
        return retval;
 }
-int usb_wwan_ioctl(struct tty_struct *tty, struct file *file,
+int usb_wwan_ioctl(struct tty_struct *tty,
                   unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 3f9ac88d588c..5b073bcc807b 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -152,12 +152,12 @@ static int  whiteheat_write(struct tty_struct *tty,
                        struct usb_serial_port *port,
                        const unsigned char *buf, int count);
 static int  whiteheat_write_room(struct tty_struct *tty);
-static int  whiteheat_ioctl(struct tty_struct *tty, struct file *file,
+static int  whiteheat_ioctl(struct tty_struct *tty,
                        unsigned int cmd, unsigned long arg);
 static void whiteheat_set_termios(struct tty_struct *tty,
                        struct usb_serial_port *port, struct ktermios *old);
-static int  whiteheat_tiocmget(struct tty_struct *tty, struct file *file);
+static int  whiteheat_tiocmget(struct tty_struct *tty);
-static int  whiteheat_tiocmset(struct tty_struct *tty, struct file *file,
+static int  whiteheat_tiocmset(struct tty_struct *tty,
                        unsigned int set, unsigned int clear);
 static void whiteheat_break_ctl(struct tty_struct *tty, int break_state);
 static int  whiteheat_chars_in_buffer(struct tty_struct *tty);
@@ -833,7 +833,7 @@ static int whiteheat_write_room(struct tty_struct *tty)
        return (room);
 }
-static int whiteheat_tiocmget(struct tty_struct *tty, struct file *file)
+static int whiteheat_tiocmget(struct tty_struct *tty)
 {
        struct usb_serial_port *port = tty->driver_data;
        struct whiteheat_private *info = usb_get_serial_port_data(port);
@@ -850,7 +850,7 @@ static int whiteheat_tiocmget(struct tty_struct *tty, struct file *file)
        return modem_signals;
 }
-static int whiteheat_tiocmset(struct tty_struct *tty, struct file *file,
+static int whiteheat_tiocmset(struct tty_struct *tty,
                               unsigned int set, unsigned int clear)
 {
        struct usb_serial_port *port = tty->driver_data;
@@ -874,7 +874,7 @@ static int whiteheat_tiocmset(struct tty_struct *tty, struct file *file,
 }
-static int whiteheat_ioctl(struct tty_struct *tty, struct file *file,
+static int whiteheat_ioctl(struct tty_struct *tty,
                                        unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;