Merge with Linus' kernel.

2 files changed, 38 insertions, 109 deletions

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index b8727d9bf690..1288d6203e94 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -37,11 +37,11 @@
  * by the bootloader or in the platform init code.
  *
  * The idx field must be equal to the PSC index ( e.g. 0 for PSC1, 1 for PSC2,
- * and so on). So the PSC1 is mapped to /dev/ttyS0, PSC2 to /dev/ttyS1 and so
- * on. But be warned, it's an ABSOLUTE REQUIREMENT ! This is needed mainly for
- * the console code : without this 1:1 mapping, at early boot time, when we are
- * parsing the kernel args console=ttyS?, we wouldn't know wich PSC it will be
- * mapped to.
+ * and so on). So the PSC1 is mapped to /dev/ttyPSC0, PSC2 to /dev/ttyPSC1 and
+ * so on. But be warned, it's an ABSOLUTE REQUIREMENT ! This is needed mainly
+ * fpr the console code : without this 1:1 mapping, at early boot time, when we
+ * are parsing the kernel args console=ttyPSC?, we wouldn't know wich PSC it
+ * will be mapped to.
  */
 
 #include <linux/config.h>
@@ -65,6 +65,10 @@
 #include <linux/serial_core.h>
 
 
+/* We've been assigned a range on the "Low-density serial ports" major */
+#define SERIAL_PSC_MAJOR        204
+#define SERIAL_PSC_MINOR        148
+
 
 #define ISR_PASS_LIMIT 256      /* Max number of iteration in the interrupt */
 
@@ -668,15 +672,15 @@ mpc52xx_console_setup(struct console *co, char *options)
 }
 
 
-extern struct uart_driver mpc52xx_uart_driver;
+static struct uart_driver mpc52xx_uart_driver;
 
 static struct console mpc52xx_console = {
-        .name   = "ttyS",
+        .name   = "ttyPSC",
         .write  = mpc52xx_console_write,
         .device = uart_console_device,
         .setup  = mpc52xx_console_setup,
         .flags  = CON_PRINTBUFFER,
-        .index  = -1,   /* Specified on the cmdline (e.g. console=ttyS0 ) */
+        .index  = -1,   /* Specified on the cmdline (e.g. console=ttyPSC0 ) */
         .data   = &mpc52xx_uart_driver,
 };
 
@@ -703,10 +707,10 @@ console_initcall(mpc52xx_console_init);
 static struct uart_driver mpc52xx_uart_driver = {
         .owner          = THIS_MODULE,
         .driver_name    = "mpc52xx_psc_uart",
-        .dev_name       = "ttyS",
-        .devfs_name     = "ttyS",
-        .major          = TTY_MAJOR,
-        .minor          = 64,
+        .dev_name       = "ttyPSC",
+        .devfs_name     = "ttyPSC",
+        .major          = SERIAL_PSC_MAJOR,
+        .minor          = SERIAL_PSC_MINOR,
         .nr             = MPC52xx_PSC_MAXNUM,
         .cons           = MPC52xx_PSC_CONSOLE,
 };
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 7ce0c7e66d37..96969cb960a9 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -114,15 +114,7 @@ struct serial_cfg_mem {
 
 
 static void serial_config(dev_link_t * link);
-static int serial_event(event_t event, int priority,
-                        event_callback_args_t * args);
 
-static dev_info_t dev_info = "serial_cs";
-
-static dev_link_t *serial_attach(void);
-static void serial_detach(dev_link_t *);
-
-static dev_link_t *dev_list = NULL;
 
 /*======================================================================
 
@@ -159,8 +151,9 @@ static void serial_remove(dev_link_t *link)
         }
 }
 
-static void serial_suspend(dev_link_t *link)
+static int serial_suspend(struct pcmcia_device *dev)
 {
+        dev_link_t *link = dev_to_instance(dev);
         link->state |= DEV_SUSPEND;
 
         if (link->state & DEV_CONFIG) {
@@ -173,10 +166,13 @@ static void serial_suspend(dev_link_t *link)
                 if (!info->slave)
                         pcmcia_release_configuration(link->handle);
         }
+
+        return 0;
 }
 
-static void serial_resume(dev_link_t *link)
+static int serial_resume(struct pcmcia_device *dev)
 {
+        dev_link_t *link = dev_to_instance(dev);
         link->state &= ~DEV_SUSPEND;
 
         if (DEV_OK(link)) {
@@ -189,6 +185,8 @@ static void serial_resume(dev_link_t *link)
                 for (i = 0; i < info->ndev; i++)
                         serial8250_resume_port(info->line[i]);
         }
+
+        return 0;
 }
 
 /*======================================================================
@@ -199,19 +197,17 @@ static void serial_resume(dev_link_t *link)
 
 ======================================================================*/
 
-static dev_link_t *serial_attach(void)
+static int serial_probe(struct pcmcia_device *p_dev)
 {
         struct serial_info *info;
-        client_reg_t client_reg;
         dev_link_t *link;
-        int ret;
 
         DEBUG(0, "serial_attach()\n");
 
         /* Create new serial device */
         info = kmalloc(sizeof (*info), GFP_KERNEL);
         if (!info)
-                return NULL;
+                return -ENOMEM;
         memset(info, 0, sizeof (*info));
         link = &info->link;
         link->priv = info;
@@ -227,20 +223,12 @@ static dev_link_t *serial_attach(void)
         }
         link->conf.IntType = INT_MEMORY_AND_IO;
 
-        /* Register with Card Services */
-        link->next = dev_list;
-        dev_list = link;
-        client_reg.dev_info = &dev_info;
-        client_reg.Version = 0x0210;
-        client_reg.event_callback_args.client_data = link;
-        ret = pcmcia_register_client(&link->handle, &client_reg);
-        if (ret != CS_SUCCESS) {
-                cs_error(link->handle, RegisterClient, ret);
-                serial_detach(link);
-                return NULL;
-        }
+        link->handle = p_dev;
+        p_dev->instance = link;
+        link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
+        serial_config(link);
 
-        return link;
+        return 0;
 }
 
 /*======================================================================
@@ -252,21 +240,13 @@ static dev_link_t *serial_attach(void)
 
 ======================================================================*/
 
-static void serial_detach(dev_link_t * link)
+static void serial_detach(struct pcmcia_device *p_dev)
 {
+        dev_link_t *link = dev_to_instance(p_dev);
         struct serial_info *info = link->priv;
-        dev_link_t **linkp;
-        int ret;
 
         DEBUG(0, "serial_detach(0x%p)\n", link);
 
-        /* Locate device structure */
-        for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
-                if (*linkp == link)
-                        break;
-        if (*linkp == NULL)
-                return;
-
         /*
          * Ensure any outstanding scheduled tasks are completed.
          */
@@ -277,14 +257,7 @@ static void serial_detach(dev_link_t * link)
          */
         serial_remove(link);
 
-        if (link->handle) {
-                ret = pcmcia_deregister_client(link->handle);
-                if (ret != CS_SUCCESS)
-                        cs_error(link->handle, DeregisterClient, ret);
-        }
-
-        /* Unlink device structure, free bits */
-        *linkp = link->next;
+        /* free bits */
         kfree(info);
 }
 
@@ -718,54 +691,6 @@ void serial_config(dev_link_t * link)
         kfree(cfg_mem);
 }
 
-/*======================================================================
-
-    The card status event handler.  Mostly, this schedules other
-    stuff to run after an event is received.  A CARD_REMOVAL event
-    also sets some flags to discourage the serial drivers from
-    talking to the ports.
-    
-======================================================================*/
-
-static int
-serial_event(event_t event, int priority, event_callback_args_t * args)
-{
-        dev_link_t *link = args->client_data;
-        struct serial_info *info = link->priv;
-
-        DEBUG(1, "serial_event(0x%06x)\n", event);
-
-        switch (event) {
-        case CS_EVENT_CARD_REMOVAL:
-                serial_remove(link);
-                break;
-
-        case CS_EVENT_CARD_INSERTION:
-                link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-                serial_config(link);
-                break;
-
-        case CS_EVENT_PM_SUSPEND:
-                serial_suspend(link);
-                break;
-
-        case CS_EVENT_RESET_PHYSICAL:
-                if ((link->state & DEV_CONFIG) && !info->slave)
-                        pcmcia_release_configuration(link->handle);
-                break;
-
-        case CS_EVENT_PM_RESUME:
-                serial_resume(link);
-                break;
-
-        case CS_EVENT_CARD_RESET:
-                if (DEV_OK(link) && !info->slave)
-                        pcmcia_request_configuration(link->handle, &link->conf);
-                break;
-        }
-        return 0;
-}
-
 static struct pcmcia_device_id serial_ids[] = {
         PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0057, 0x0021),
         PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0089, 0x110a),
@@ -877,10 +802,11 @@ static struct pcmcia_driver serial_cs_driver = {
         .drv            = {
                 .name   = "serial_cs",
         },
-        .attach         = serial_attach,
-        .event          = serial_event,
-        .detach         = serial_detach,
+        .probe          = serial_probe,
+        .remove         = serial_detach,
         .id_table       = serial_ids,
+        .suspend        = serial_suspend,
+        .resume         = serial_resume,
 };
 
 static int __init init_serial_cs(void)
@@ -891,7 +817,6 @@ static int __init init_serial_cs(void)
 static void __exit exit_serial_cs(void)
 {
         pcmcia_unregister_driver(&serial_cs_driver);
-        BUG_ON(dev_list != NULL);
 }
 
 module_init(init_serial_cs);