Merge tag 'tty-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial updates from Greg KH:
 "Here's the big tty/serial driver update for 4.1-rc1.

  It was delayed for a bit due to some questions surrounding some of the
  console command line parsing changes that are in here.  There's still
  one tiny regression for people who were previously putting multiple
  console command lines and expecting them all to be ignored for some
  odd reason, but Peter is working on fixing that.  If not, I'll send a
  revert for the offending patch, but I have faith that Peter can
  address it.

  Other than the console work here, there's the usual serial driver
  updates and changes, and a buch of 8250 reworks to try to make that
  driver easier to maintain over time, and have it support more devices
  in the future.

  All of these have been in linux-next for a while"

* tag 'tty-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (119 commits)
  n_gsm: Drop unneeded cast on netdev_priv
  sc16is7xx: expose RTS inversion in RS-485 mode
  serial: 8250_pci: port failed after wakeup from S3
  earlycon: 8250: Document kernel command line options
  earlycon: 8250: Fix command line regression
  earlycon: Fix __earlycon_table stride
  tty: clean up the tty time logic a bit
  serial: 8250_dw: only get the clock rate in one place
  serial: 8250_dw: remove useless ACPI ID check
  dmaengine: hsu: move memory allocation to GFP_NOWAIT
  dmaengine: hsu: remove redundant pieces of code
  serial: 8250_pci: add Intel Tangier support
  dmaengine: hsu: add Intel Tangier PCI ID
  serial: 8250_pci: replace switch-case by formula for Intel MID
  serial: 8250_pci: replace switch-case by formula
  tty: cpm_uart: replace CONFIG_8xx by CONFIG_CPM1
  serial: jsm: some off by one bugs
  serial: xuartps: Fix check in console_setup().
  serial: xuartps: Get rid of register access macros.
  serial: xuartps: Fix iobase use.
  ...

1 files changed, 18 insertions, 35 deletions

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 879edfc5ee52..c099b082cd02 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2017,24 +2017,6 @@ int add_preferred_console(char *name, int idx, char *options)
         return __add_preferred_console(name, idx, options, NULL);
 }
 
-int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options)
-{
-        struct console_cmdline *c;
-        int i;
-
-        for (i = 0, c = console_cmdline;
-             i < MAX_CMDLINECONSOLES && c->name[0];
-             i++, c++)
-                if (strcmp(c->name, name) == 0 && c->index == idx) {
-                        strlcpy(c->name, name_new, sizeof(c->name));
-                        c->options = options;
-                        c->index = idx_new;
-                        return i;
-                }
-        /* not found */
-        return -1;
-}
-
 bool console_suspend_enabled = true;
 EXPORT_SYMBOL(console_suspend_enabled);
 
@@ -2436,9 +2418,6 @@ void register_console(struct console *newcon)
         if (preferred_console < 0 || bcon || !console_drivers)
                 preferred_console = selected_console;
 
-        if (newcon->early_setup)
-                newcon->early_setup();
-
         /*
          *      See if we want to use this console driver. If we
          *      didn't select a console we take the first one
@@ -2464,23 +2443,27 @@ void register_console(struct console *newcon)
         for (i = 0, c = console_cmdline;
              i < MAX_CMDLINECONSOLES && c->name[0];
              i++, c++) {
-                BUILD_BUG_ON(sizeof(c->name) != sizeof(newcon->name));
-                if (strcmp(c->name, newcon->name) != 0)
-                        continue;
-                if (newcon->index >= 0 &&
-                    newcon->index != c->index)
-                        continue;
-                if (newcon->index < 0)
-                        newcon->index = c->index;
+                if (!newcon->match ||
+                    newcon->match(newcon, c->name, c->index, c->options) != 0) {
+                        /* default matching */
+                        BUILD_BUG_ON(sizeof(c->name) != sizeof(newcon->name));
+                        if (strcmp(c->name, newcon->name) != 0)
+                                continue;
+                        if (newcon->index >= 0 &&
+                            newcon->index != c->index)
+                                continue;
+                        if (newcon->index < 0)
+                                newcon->index = c->index;
 
-                if (_braille_register_console(newcon, c))
-                        return;
+                        if (_braille_register_console(newcon, c))
+                                return;
+
+                        if (newcon->setup &&
+                            newcon->setup(newcon, c->options) != 0)
+                                break;
+                }
 
-                if (newcon->setup &&
-                    newcon->setup(newcon, console_cmdline[i].options) != 0)
-                        break;
                 newcon->flags |= CON_ENABLED;
-                newcon->index = c->index;
                 if (i == selected_console) {
                         newcon->flags |= CON_CONSDEV;
                         preferred_console = selected_console;