Pull sn2-reduce-kmalloc-wrap into release branch

[linux-2.6-omap-h63xx.git] / drivers / scsi / pcmcia / qlogic_stub.c

diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 2541a999a0e5939039937efbd0c1caa1ba2919e7..dce7e687fd4a2a2caf597026b5f6be7d3af6a71c 100644 (file)
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -98,15 +98,8 @@ typedef struct scsi_info_t {
 } scsi_info_t;
 
 static void qlogic_release(dev_link_t *link);
-static int qlogic_event(event_t event, int priority, event_callback_args_t * args);
-
-static dev_link_t *qlogic_attach(void);
-static void qlogic_detach(dev_link_t *);
-
-
-static dev_link_t *dev_list = NULL;
-
-static dev_info_t dev_info = "qlogic_cs";
+static void qlogic_detach(struct pcmcia_device *p_dev);
+static void qlogic_config(dev_link_t * link);
 
 static struct Scsi_Host *qlogic_detect(struct scsi_host_template *host,
                                dev_link_t *link, int qbase, int qlirq)
@@ -163,19 +156,17 @@ free_scsi_host:
 err:
        return NULL;
 }
-static dev_link_t *qlogic_attach(void)
+static int qlogic_attach(struct pcmcia_device *p_dev)
 {
        scsi_info_t *info;
-       client_reg_t client_reg;
        dev_link_t *link;
-       int ret;
 
        DEBUG(0, "qlogic_attach()\n");
 
        /* Create new SCSI device */
        info = kmalloc(sizeof(*info), GFP_KERNEL);
        if (!info)
-               return NULL;
+               return -ENOMEM;
        memset(info, 0, sizeof(*info));
        link = &info->link;
        link->priv = info;
@@ -189,45 +180,26 @@ static dev_link_t *qlogic_attach(void)
        link->conf.IntType = INT_MEMORY_AND_IO;
        link->conf.Present = PRESENT_OPTION;
 
-       /* 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 != 0) {
-               cs_error(link->handle, RegisterClient, ret);
-               qlogic_detach(link);
-               return NULL;
-       }
+       link->handle = p_dev;
+       p_dev->instance = link;
+
+       link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
+       qlogic_config(link);
 
-       return link;
+       return 0;
 }                              /* qlogic_attach */
 
 /*====================================================================*/
 
-static void qlogic_detach(dev_link_t * link)
+static void qlogic_detach(struct pcmcia_device *p_dev)
 {
-       dev_link_t **linkp;
+       dev_link_t *link = dev_to_instance(p_dev);
 
        DEBUG(0, "qlogic_detach(0x%p)\n", link);
 
-       /* Locate device structure */
-       for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
-               if (*linkp == link)
-                       break;
-       if (*linkp == NULL)
-               return;
-
        if (link->state & DEV_CONFIG)
                qlogic_release(link);
 
-       if (link->handle)
-               pcmcia_deregister_client(link->handle);
-
-       /* Unlink device structure, free bits */
-       *linkp = link->next;
        kfree(link->priv);
 
 }                              /* qlogic_detach */
@@ -383,26 +355,6 @@ static int qlogic_resume(struct pcmcia_device *dev)
        return 0;
 }
 
-static int qlogic_event(event_t event, int priority, event_callback_args_t * args)
-{
-       dev_link_t *link = args->client_data;
-
-       DEBUG(1, "qlogic_event(0x%06x)\n", event);
-
-       switch (event) {
-       case CS_EVENT_CARD_REMOVAL:
-               link->state &= ~DEV_PRESENT;
-               if (link->state & DEV_CONFIG)
-                       qlogic_release(link);
-               break;
-       case CS_EVENT_CARD_INSERTION:
-               link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-               qlogic_config(link);
-               break;
-       }
-       return 0;
-}                              /* qlogic_event */
-
 static struct pcmcia_device_id qlogic_ids[] = {
        PCMCIA_DEVICE_PROD_ID12("EIger Labs", "PCMCIA-to-SCSI Adapter", 0x88395fa7, 0x33b7a5e6),
        PCMCIA_DEVICE_PROD_ID12("EPSON", "SCSI-2 PC Card SC200", 0xd361772f, 0x299d1751),
@@ -430,9 +382,8 @@ static struct pcmcia_driver qlogic_cs_driver = {
        .drv            = {
        .name           = "qlogic_cs",
        },
-       .attach         = qlogic_attach,
-       .event          = qlogic_event,
-       .detach         = qlogic_detach,
+       .probe          = qlogic_attach,
+       .remove         = qlogic_detach,
        .id_table       = qlogic_ids,
        .suspend        = qlogic_suspend,
        .resume         = qlogic_resume,
@@ -446,7 +397,6 @@ static int __init init_qlogic_cs(void)
 static void __exit exit_qlogic_cs(void)
 {
        pcmcia_unregister_driver(&qlogic_cs_driver);
-       BUG_ON(dev_list != NULL);
 }
 
 MODULE_AUTHOR("Tom Zerucha, Michael Griffith");