Pull battery into release branch

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

diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index a2a1c4b318e67c472f45673f5a4269debbc8250b..67c5a58d17df7fb11eca2c8e427a61719d57c086 100644 (file)
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -34,7 +34,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/ioport.h>
@@ -99,7 +98,7 @@ typedef struct scsi_info_t {
 
 static void qlogic_release(struct pcmcia_device *link);
 static void qlogic_detach(struct pcmcia_device *p_dev);
-static void qlogic_config(struct pcmcia_device * link);
+static int qlogic_config(struct pcmcia_device * link);
 
 static struct Scsi_Host *qlogic_detect(struct scsi_host_template *host,
                                struct pcmcia_device *link, int qbase, int qlirq)
@@ -156,17 +155,16 @@ free_scsi_host:
 err:
        return NULL;
 }
-static int qlogic_attach(struct pcmcia_device *link)
+static int qlogic_probe(struct pcmcia_device *link)
 {
        scsi_info_t *info;
 
        DEBUG(0, "qlogic_attach()\n");
 
        /* Create new SCSI device */
-       info = kmalloc(sizeof(*info), GFP_KERNEL);
+       info = kzalloc(sizeof(*info), GFP_KERNEL);
        if (!info)
                return -ENOMEM;
-       memset(info, 0, sizeof(*info));
        info->p_dev = link;
        link->priv = info;
        link->io.NumPorts1 = 16;
@@ -178,10 +176,7 @@ static int qlogic_attach(struct pcmcia_device *link)
        link->conf.IntType = INT_MEMORY_AND_IO;
        link->conf.Present = PRESENT_OPTION;
 
-       link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-       qlogic_config(link);
-
-       return 0;
+       return qlogic_config(link);
 }                              /* qlogic_attach */
 
 /*====================================================================*/
@@ -190,9 +185,7 @@ static void qlogic_detach(struct pcmcia_device *link)
 {
        DEBUG(0, "qlogic_detach(0x%p)\n", link);
 
-       if (link->state & DEV_CONFIG)
-               qlogic_release(link);
-
+       qlogic_release(link);
        kfree(link->priv);
 
 }                              /* qlogic_detach */
@@ -202,7 +195,7 @@ static void qlogic_detach(struct pcmcia_device *link)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-static void qlogic_config(struct pcmcia_device * link)
+static int qlogic_config(struct pcmcia_device * link)
 {
        scsi_info_t *info = link->priv;
        tuple_t tuple;
@@ -213,21 +206,11 @@ static void qlogic_config(struct pcmcia_device * link)
 
        DEBUG(0, "qlogic_config(0x%p)\n", link);
 
+       info->manf_id = link->manf_id;
+
        tuple.TupleData = (cisdata_t *) tuple_data;
        tuple.TupleDataMax = 64;
        tuple.TupleOffset = 0;
-       tuple.DesiredTuple = CISTPL_CONFIG;
-       CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-       CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
-       CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
-       link->conf.ConfigBase = parse.config.base;
-
-       tuple.DesiredTuple = CISTPL_MANFID;
-       if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) && (pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS))
-               info->manf_id = le16_to_cpu(tuple.TupleData[0]);
-
-       /* Configure card */
-       link->state |= DEV_CONFIG;
 
        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
@@ -267,21 +250,19 @@ static void qlogic_config(struct pcmcia_device * link)
        
        if (!host) {
                printk(KERN_INFO "%s: no SCSI devices found\n", qlogic_name);
-               goto out;
+               goto cs_failed;
        }
 
        sprintf(info->node.dev_name, "scsi%d", host->host_no);
        link->dev_node = &info->node;
        info->host = host;
 
-out:
-       link->state &= ~DEV_CONFIG_PENDING;
-       return;
+       return 0;
 
 cs_failed:
        cs_error(link, last_fn, last_ret);
        pcmcia_disable_device(link);
-       return;
+       return -ENODEV;
 
 }                              /* qlogic_config */
 
@@ -305,20 +286,18 @@ static void qlogic_release(struct pcmcia_device *link)
 
 static int qlogic_resume(struct pcmcia_device *link)
 {
-       if (link->state & DEV_CONFIG) {
-               scsi_info_t *info = link->priv;
-
-               pcmcia_request_configuration(link, &link->conf);
-               if ((info->manf_id == MANFID_MACNICA) ||
-                   (info->manf_id == MANFID_PIONEER) ||
-                   (info->manf_id == 0x0098)) {
-                       outb(0x80, link->io.BasePort1 + 0xd);
-                       outb(0x24, link->io.BasePort1 + 0x9);
-                       outb(0x04, link->io.BasePort1 + 0xd);
-               }
-               /* Ugggglllyyyy!!! */
-               qlogicfas408_bus_reset(NULL);
+       scsi_info_t *info = link->priv;
+
+       pcmcia_request_configuration(link, &link->conf);
+       if ((info->manf_id == MANFID_MACNICA) ||
+           (info->manf_id == MANFID_PIONEER) ||
+           (info->manf_id == 0x0098)) {
+               outb(0x80, link->io.BasePort1 + 0xd);
+               outb(0x24, link->io.BasePort1 + 0x9);
+               outb(0x04, link->io.BasePort1 + 0xd);
        }
+       /* Ugggglllyyyy!!! */
+       qlogicfas408_bus_reset(NULL);
 
        return 0;
 }
@@ -350,7 +329,7 @@ static struct pcmcia_driver qlogic_cs_driver = {
        .drv            = {
        .name           = "qlogic_cs",
        },
-       .probe          = qlogic_attach,
+       .probe          = qlogic_probe,
        .remove         = qlogic_detach,
        .id_table       = qlogic_ids,
        .resume         = qlogic_resume,