Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / drivers / serial / serial_cs.c

diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 8cfa5b1..dadd686 100644 (file)
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -89,7 +89,6 @@ struct serial_info {
        int                     manfid;
        int                     prodid;
        int                     c950ctrl;
-       dev_node_t              node[4];
        int                     line[4];
        const struct serial_quirk *quirk;
 };
@@ -289,8 +288,6 @@ static void serial_remove(struct pcmcia_device *link)
        for (i = 0; i < info->ndev; i++)
                serial8250_unregister_port(info->line[i]);
 
-       info->p_dev->dev_node = NULL;
-
        if (!info->slave)
                pcmcia_disable_device(link);
 }
@@ -343,7 +340,6 @@ static int serial_probe(struct pcmcia_device *link)
 
        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
        link->io.NumPorts1 = 8;
-       link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
        link->conf.Attributes = CONF_ENABLE_IRQ;
        if (do_sound) {
                link->conf.Attributes |= CONF_ENABLE_SPKR;
@@ -411,11 +407,6 @@ static int setup_serial(struct pcmcia_device *handle, struct serial_info * info,
        }
 
        info->line[info->ndev] = line;
-       sprintf(info->node[info->ndev].dev_name, "ttyS%d", line);
-       info->node[info->ndev].major = TTY_MAJOR;
-       info->node[info->ndev].minor = 0x40 + line;
-       if (info->ndev > 0)
-               info->node[info->ndev - 1].next = &info->node[info->ndev];
        info->ndev++;
 
        return 0;
@@ -486,7 +477,7 @@ static int simple_config(struct pcmcia_device *link)
                }
                if (info->slave) {
                        return setup_serial(link, info, port,
-                                           link->irq.AssignedIRQ);
+                                           link->irq);
                }
        }
 
@@ -507,10 +498,6 @@ static int simple_config(struct pcmcia_device *link)
        return -1;
 
 found_port:
-       i = pcmcia_request_irq(link, &link->irq);
-       if (i != 0)
-               link->irq.AssignedIRQ = 0;
-
        if (info->multi && (info->manfid == MANFID_3COM))
                link->conf.ConfigIndex &= ~(0x08);
 
@@ -523,7 +510,7 @@ found_port:
        i = pcmcia_request_configuration(link, &link->conf);
        if (i != 0)
                return -1;
-       return setup_serial(link, info, link->io.BasePort1, link->irq.AssignedIRQ);
+       return setup_serial(link, info, link->io.BasePort1, link->irq);
 }
 
 static int multi_config_check(struct pcmcia_device *p_dev,
@@ -586,13 +573,9 @@ static int multi_config(struct pcmcia_device *link)
                }
        }
 
-       i = pcmcia_request_irq(link, &link->irq);
-       if (i != 0) {
-               /* FIXME: comment does not fit, error handling does not fit */
-               printk(KERN_NOTICE
-                      "serial_cs: no usable port range found, giving up\n");
-               link->irq.AssignedIRQ = 0;
-       }
+       if (!link->irq)
+               dev_warn(&link->dev,
+                       "serial_cs: no usable IRQ found, continuing...\n");
 
        /*
         * Apply any configuration quirks.
@@ -615,11 +598,11 @@ static int multi_config(struct pcmcia_device *link)
                if (link->conf.ConfigIndex == 1 ||
                    link->conf.ConfigIndex == 3) {
                        err = setup_serial(link, info, base2,
-                                       link->irq.AssignedIRQ);
+                                       link->irq);
                        base2 = link->io.BasePort1;
                } else {
                        err = setup_serial(link, info, link->io.BasePort1,
-                                       link->irq.AssignedIRQ);
+                                       link->irq);
                }
                info->c950ctrl = base2;
 
@@ -633,10 +616,10 @@ static int multi_config(struct pcmcia_device *link)
                return 0;
        }
 
-       setup_serial(link, info, link->io.BasePort1, link->irq.AssignedIRQ);
+       setup_serial(link, info, link->io.BasePort1, link->irq);
        for (i = 0; i < info->multi - 1; i++)
                setup_serial(link, info, base2 + (8 * i),
-                               link->irq.AssignedIRQ);
+                               link->irq);
        return 0;
 }
 
@@ -720,7 +703,6 @@ static int serial_config(struct pcmcia_device * link)
                if (info->quirk->post(link))
                        goto failed;
 
-       link->dev_node = &info->node[0];
        return 0;
 
 failed: