Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (36 commits)
  serial: apbuart: Fixup apbuart_console_init()
  TTY: Add tty ioctl to figure device node of the system console.
  tty: add 'active' sysfs attribute to tty0 and console device
  drivers: serial: apbuart: Handle OF failures gracefully
  Serial: Avoid unbalanced IRQ wake disable during resume
  tty: fix typos/errors in tty_driver.h comments
  pch_uart : fix warnings for 64bit compile
  8250: fix uninitialized FIFOs
  ip2: fix compiler warning on ip2main_pci_tbl
  specialix: fix compiler warning on specialix_pci_tbl
  rocket: fix compiler warning on rocket_pci_ids
  8250: add a UPIO_DWAPB32 for 32 bit accesses
  8250: use container_of() instead of casting
  serial: omap-serial: Add support for kernel debugger
  serial: fix pch_uart kconfig & build
  drivers: char: hvc: add arm JTAG DCC console support
  RS485 documentation: add 16C950 UART description
  serial: ifx6x60: fix memory leak
  serial: ifx6x60: free IRQ on error
  Serial: EG20T: add PCH_UART driver
  ...

Fixed up conflicts in drivers/serial/apbuart.c with evil merge that
makes the code look fairly sane (unlike either side).

1 files changed, 25 insertions, 32 deletions

diff --git a/drivers/serial/apbuart.c b/drivers/serial/apbuart.c
index 767ce9e396c5..095a5d562618 100644
--- a/drivers/serial/apbuart.c
+++ b/drivers/serial/apbuart.c
@@ -521,11 +521,12 @@ static struct console grlib_apbuart_console = {
 };
 
 
-static void grlib_apbuart_configure(void);
+static int grlib_apbuart_configure(void);
 
 static int __init apbuart_console_init(void)
 {
-        grlib_apbuart_configure();
+        if (grlib_apbuart_configure())
+                return -ENODEV;
         register_console(&grlib_apbuart_console);
         return 0;
 }
@@ -596,57 +597,49 @@ static struct of_platform_driver grlib_apbuart_of_driver = {
 };
 
 
-static void grlib_apbuart_configure(void)
+static int grlib_apbuart_configure(void)
 {
-        static int enum_done;
         struct device_node *np, *rp;
-        struct uart_port *port = NULL;
         const u32 *prop;
-        int freq_khz;
-        int v = 0, d = 0;
-        unsigned int addr;
-        int irq, line;
-        struct amba_prom_registers *regs;
-
-        if (enum_done)
-                return;
+        int freq_khz, line = 0;
 
         /* Get bus frequency */
         rp = of_find_node_by_path("/");
+        if (!rp)
+                return -ENODEV;
         rp = of_get_next_child(rp, NULL);
+        if (!rp)
+                return -ENODEV;
         prop = of_get_property(rp, "clock-frequency", NULL);
+        if (!prop)
+                return -ENODEV;
         freq_khz = *prop;
 
-        line = 0;
         for_each_matching_node(np, apbuart_match) {
+                const int *irqs, *ampopts;
+                const struct amba_prom_registers *regs;
+                struct uart_port *port;
+                unsigned long addr;
 
-                int *vendor = (int *) of_get_property(np, "vendor", NULL);
-                int *device = (int *) of_get_property(np, "device", NULL);
-                int *irqs = (int *) of_get_property(np, "interrupts", NULL);
-                int *ampopts = (int *) of_get_property(np, "ampopts", NULL);
-                regs = (struct amba_prom_registers *)
-                    of_get_property(np, "reg", NULL);
-
+                ampopts = of_get_property(np, "ampopts", NULL);
                 if (ampopts && (*ampopts == 0))
                         continue; /* Ignore if used by another OS instance */
-                if (vendor)
-                        v = *vendor;
-                if (device)
-                        d = *device;
+
+                irqs = of_get_property(np, "interrupts", NULL);
+                regs = of_get_property(np, "reg", NULL);
 
                 if (!irqs || !regs)
-                        return;
+                        continue;
 
                 grlib_apbuart_nodes[line] = np;
 
                 addr = regs->phys_addr;
-                irq = *irqs;
 
                 port = &grlib_apbuart_ports[line];
 
                 port->mapbase = addr;
                 port->membase = ioremap(addr, sizeof(struct grlib_apbuart_regs_map));
-                port->irq = irq;
+                port->irq = *irqs;
                 port->iotype = UPIO_MEM;
                 port->ops = &grlib_apbuart_ops;
                 port->flags = UPF_BOOT_AUTOCONF;
@@ -658,12 +651,10 @@ static void grlib_apbuart_configure(void)
                 /* We support maximum UART_NR uarts ... */
                 if (line == UART_NR)
                         break;
-
         }
 
-        enum_done = 1;
-
         grlib_apbuart_driver.nr = grlib_apbuart_port_nr = line;
+        return line ? 0 : -ENODEV;
 }
 
 static int __init grlib_apbuart_init(void)
@@ -671,7 +662,9 @@ static int __init grlib_apbuart_init(void)
         int ret;
 
         /* Find all APBUARTS in device the tree and initialize their ports */
-        grlib_apbuart_configure();
+        ret = grlib_apbuart_configure();
+        if (ret)
+                return ret;
 
         printk(KERN_INFO "Serial: GRLIB APBUART driver\n");