MIPS: Alchemy: Basic support for the DB1300 board.
[linux-2.6.git] / drivers / pcmcia / ds.c
index 9f300d3..749c2a1 100644 (file)
@@ -10,7 +10,7 @@
  * are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
  *
  * (C) 1999            David A. Hinds
- * (C) 2003 - 2006     Dominik Brodowski
+ * (C) 2003 - 2010     Dominik Brodowski
  */
 
 #include <linux/kernel.h>
@@ -24,9 +24,8 @@
 #include <linux/firmware.h>
 #include <linux/kref.h>
 #include <linux/dma-mapping.h>
+#include <linux/slab.h>
 
-#include <pcmcia/cs_types.h>
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
 #include <pcmcia/ss.h>
@@ -41,141 +40,21 @@ MODULE_AUTHOR("David Hinds <dahinds@users.sourceforge.net>");
 MODULE_DESCRIPTION("PCMCIA Driver Services");
 MODULE_LICENSE("GPL");
 
-#ifdef CONFIG_PCMCIA_DEBUG
-int ds_pc_debug;
-
-module_param_named(pc_debug, ds_pc_debug, int, 0644);
-
-#define ds_dbg(lvl, fmt, arg...) do {                          \
-       if (ds_pc_debug > (lvl))                                \
-               printk(KERN_DEBUG "ds: " fmt , ## arg);         \
-} while (0)
-#define ds_dev_dbg(lvl, dev, fmt, arg...) do {                         \
-       if (ds_pc_debug > (lvl))                                        \
-               dev_printk(KERN_DEBUG, dev, "ds: " fmt , ## arg);       \
-} while (0)
-#else
-#define ds_dbg(lvl, fmt, arg...) do { } while (0)
-#define ds_dev_dbg(lvl, dev, fmt, arg...) do { } while (0)
-#endif
-
-spinlock_t pcmcia_dev_list_lock;
 
 /*====================================================================*/
 
-/* code which was in cs.c before */
-
-/* String tables for error messages */
-
-typedef struct lookup_t {
-    const int key;
-    const char *msg;
-} lookup_t;
-
-static const lookup_t error_table[] = {
-    { 0,                       "Operation succeeded" },
-    { -EIO,                    "Input/Output error" },
-    { -ENODEV,                 "No card present" },
-    { -EINVAL,                 "Bad parameter" },
-    { -EACCES,                 "Configuration locked" },
-    { -EBUSY,                  "Resource in use" },
-    { -ENOSPC,                 "No more items" },
-    { -ENOMEM,                 "Out of resource" },
-};
-
-
-static const lookup_t service_table[] = {
-    { AccessConfigurationRegister,     "AccessConfigurationRegister" },
-    { AddSocketServices,               "AddSocketServices" },
-    { AdjustResourceInfo,              "AdjustResourceInfo" },
-    { CheckEraseQueue,                 "CheckEraseQueue" },
-    { CloseMemory,                     "CloseMemory" },
-    { DeregisterClient,                        "DeregisterClient" },
-    { DeregisterEraseQueue,            "DeregisterEraseQueue" },
-    { GetCardServicesInfo,             "GetCardServicesInfo" },
-    { GetClientInfo,                   "GetClientInfo" },
-    { GetConfigurationInfo,            "GetConfigurationInfo" },
-    { GetEventMask,                    "GetEventMask" },
-    { GetFirstClient,                  "GetFirstClient" },
-    { GetFirstRegion,                  "GetFirstRegion" },
-    { GetFirstTuple,                   "GetFirstTuple" },
-    { GetNextClient,                   "GetNextClient" },
-    { GetNextRegion,                   "GetNextRegion" },
-    { GetNextTuple,                    "GetNextTuple" },
-    { GetStatus,                       "GetStatus" },
-    { GetTupleData,                    "GetTupleData" },
-    { MapMemPage,                      "MapMemPage" },
-    { ModifyConfiguration,             "ModifyConfiguration" },
-    { ModifyWindow,                    "ModifyWindow" },
-    { OpenMemory,                      "OpenMemory" },
-    { ParseTuple,                      "ParseTuple" },
-    { ReadMemory,                      "ReadMemory" },
-    { RegisterClient,                  "RegisterClient" },
-    { RegisterEraseQueue,              "RegisterEraseQueue" },
-    { RegisterMTD,                     "RegisterMTD" },
-    { ReleaseConfiguration,            "ReleaseConfiguration" },
-    { ReleaseIO,                       "ReleaseIO" },
-    { ReleaseIRQ,                      "ReleaseIRQ" },
-    { ReleaseWindow,                   "ReleaseWindow" },
-    { RequestConfiguration,            "RequestConfiguration" },
-    { RequestIO,                       "RequestIO" },
-    { RequestIRQ,                      "RequestIRQ" },
-    { RequestSocketMask,               "RequestSocketMask" },
-    { RequestWindow,                   "RequestWindow" },
-    { ResetCard,                       "ResetCard" },
-    { SetEventMask,                    "SetEventMask" },
-    { ValidateCIS,                     "ValidateCIS" },
-    { WriteMemory,                     "WriteMemory" },
-    { BindDevice,                      "BindDevice" },
-    { BindMTD,                         "BindMTD" },
-    { ReportError,                     "ReportError" },
-    { SuspendCard,                     "SuspendCard" },
-    { ResumeCard,                      "ResumeCard" },
-    { EjectCard,                       "EjectCard" },
-    { InsertCard,                      "InsertCard" },
-    { ReplaceCIS,                      "ReplaceCIS" }
-};
-
-const char *pcmcia_error_func(int func)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(service_table); i++)
-               if (service_table[i].key == func)
-                       return service_table[i].msg;
-
-       return "Unknown service number";
-}
-EXPORT_SYMBOL(pcmcia_error_func);
-
-const char *pcmcia_error_ret(int ret)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(error_table); i++)
-               if (error_table[i].key == ret)
-                       return error_table[i].msg;
-
-       return "unknown";
-}
-EXPORT_SYMBOL(pcmcia_error_ret);
-
-/*======================================================================*/
-
-
-
 static void pcmcia_check_driver(struct pcmcia_driver *p_drv)
 {
-       struct pcmcia_device_id *did = p_drv->id_table;
+       const struct pcmcia_device_id *did = p_drv->id_table;
        unsigned int i;
        u32 hash;
 
        if (!p_drv->probe || !p_drv->remove)
                printk(KERN_DEBUG "pcmcia: %s lacks a requisite callback "
-                      "function\n", p_drv->drv.name);
+                      "function\n", p_drv->name);
 
        while (did && did->match_flags) {
-               for (i=0; i<4; i++) {
+               for (i = 0; i < 4; i++) {
                        if (!did->prod_id[i])
                                continue;
 
@@ -185,7 +64,7 @@ static void pcmcia_check_driver(struct pcmcia_driver *p_drv)
 
                        printk(KERN_DEBUG "pcmcia: %s: invalid hash for "
                               "product string \"%s\": is 0x%x, should "
-                              "be 0x%x\n", p_drv->drv.name, did->prod_id[i],
+                              "be 0x%x\n", p_drv->name, did->prod_id[i],
                               did->prod_id_hash[i], hash);
                        printk(KERN_DEBUG "pcmcia: see "
                                "Documentation/pcmcia/devicetable.txt for "
@@ -223,7 +102,7 @@ pcmcia_store_new_id(struct device_driver *driver, const char *buf, size_t count)
        __u16 match_flags, manf_id, card_id;
        __u8 func_id, function, device_no;
        __u32 prod_id_hash[4] = {0, 0, 0, 0};
-       int fields=0;
+       int fields = 0;
        int retval = 0;
 
        fields = sscanf(buf, "%hx %hx %hx %hhx %hhx %hhx %x %x %x %x",
@@ -244,9 +123,9 @@ pcmcia_store_new_id(struct device_driver *driver, const char *buf, size_t count)
        dynid->id.device_no = device_no;
        memcpy(dynid->id.prod_id_hash, prod_id_hash, sizeof(__u32) * 4);
 
-       spin_lock(&pdrv->dynids.lock);
+       mutex_lock(&pdrv->dynids.lock);
        list_add_tail(&dynid->node, &pdrv->dynids.list);
-       spin_unlock(&pdrv->dynids.lock);
+       mutex_unlock(&pdrv->dynids.lock);
 
        if (get_driver(&pdrv->drv)) {
                retval = driver_attach(&pdrv->drv);
@@ -264,12 +143,12 @@ pcmcia_free_dynids(struct pcmcia_driver *drv)
 {
        struct pcmcia_dynid *dynid, *n;
 
-       spin_lock(&drv->dynids.lock);
+       mutex_lock(&drv->dynids.lock);
        list_for_each_entry_safe(dynid, n, &drv->dynids.list, node) {
                list_del(&dynid->node);
                kfree(dynid);
        }
-       spin_unlock(&drv->dynids.lock);
+       mutex_unlock(&drv->dynids.lock);
 }
 
 static int
@@ -300,10 +179,11 @@ int pcmcia_register_driver(struct pcmcia_driver *driver)
        /* initialize common fields */
        driver->drv.bus = &pcmcia_bus_type;
        driver->drv.owner = driver->owner;
-       spin_lock_init(&driver->dynids.lock);
+       driver->drv.name = driver->name;
+       mutex_init(&driver->dynids.lock);
        INIT_LIST_HEAD(&driver->dynids.list);
 
-       ds_dbg(3, "registering driver %s\n", driver->drv.name);
+       pr_debug("registering driver %s\n", driver->name);
 
        error = driver_register(&driver->drv);
        if (error < 0)
@@ -323,7 +203,7 @@ EXPORT_SYMBOL(pcmcia_register_driver);
  */
 void pcmcia_unregister_driver(struct pcmcia_driver *driver)
 {
-       ds_dbg(3, "unregistering driver %s\n", driver->drv.name);
+       pr_debug("unregistering driver %s\n", driver->name);
        driver_unregister(&driver->drv);
        pcmcia_free_dynids(driver);
 }
@@ -332,7 +212,7 @@ EXPORT_SYMBOL(pcmcia_unregister_driver);
 
 /* pcmcia_device handling */
 
-struct pcmcia_device * pcmcia_get_dev(struct pcmcia_device *p_dev)
+static struct pcmcia_device *pcmcia_get_dev(struct pcmcia_device *p_dev)
 {
        struct device *tmp_dev;
        tmp_dev = get_device(&p_dev->dev);
@@ -341,7 +221,7 @@ struct pcmcia_device * pcmcia_get_dev(struct pcmcia_device *p_dev)
        return to_pcmcia_dev(tmp_dev);
 }
 
-void pcmcia_put_dev(struct pcmcia_device *p_dev)
+static void pcmcia_put_dev(struct pcmcia_device *p_dev)
 {
        if (p_dev)
                put_device(&p_dev->dev);
@@ -350,37 +230,28 @@ void pcmcia_put_dev(struct pcmcia_device *p_dev)
 static void pcmcia_release_function(struct kref *ref)
 {
        struct config_t *c = container_of(ref, struct config_t, ref);
-       ds_dbg(1, "releasing config_t\n");
+       pr_debug("releasing config_t\n");
        kfree(c);
 }
 
 static void pcmcia_release_dev(struct device *dev)
 {
        struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
-       ds_dev_dbg(1, dev, "releasing device\n");
+       int i;
+       dev_dbg(dev, "releasing device\n");
        pcmcia_put_socket(p_dev->socket);
+       for (i = 0; i < 4; i++)
+               kfree(p_dev->prod_id[i]);
        kfree(p_dev->devname);
        kref_put(&p_dev->function_config->ref, pcmcia_release_function);
        kfree(p_dev);
 }
 
-static void pcmcia_add_device_later(struct pcmcia_socket *s, int mfc)
-{
-       if (!s->pcmcia_state.device_add_pending) {
-               ds_dev_dbg(1, &s->dev, "scheduling to add %s secondary"
-                      " device to %d\n", mfc ? "mfc" : "pfc", s->sock);
-               s->pcmcia_state.device_add_pending = 1;
-               s->pcmcia_state.mfc_pfc = mfc;
-               schedule_work(&s->device_add);
-       }
-       return;
-}
 
-static int pcmcia_device_probe(struct device * dev)
+static int pcmcia_device_probe(struct device *dev)
 {
        struct pcmcia_device *p_dev;
        struct pcmcia_driver *p_drv;
-       struct pcmcia_device_id *did;
        struct pcmcia_socket *s;
        cistpl_config_t cis_config;
        int ret = 0;
@@ -393,19 +264,7 @@ static int pcmcia_device_probe(struct device * dev)
        p_drv = to_pcmcia_drv(dev->driver);
        s = p_dev->socket;
 
-       /* The PCMCIA code passes the match data in via dev_set_drvdata(dev)
-        * which is an ugly hack. Once the driver probe is called it may
-        * and often will overwrite the match data so we must save it first
-        *
-        * handle pseudo multifunction devices:
-        * there are at most two pseudo multifunction devices.
-        * if we're matching against the first, schedule a
-        * call which will then check whether there are two
-        * pseudo devices, and if not, add the second one.
-        */
-       did = dev_get_drvdata(&p_dev->dev);
-
-       ds_dev_dbg(1, dev, "trying to bind to %s\n", p_drv->drv.name);
+       dev_dbg(dev, "trying to bind to %s\n", p_drv->name);
 
        if ((!p_drv->probe) || (!p_dev->function_config) ||
            (!try_module_get(p_drv->owner))) {
@@ -417,25 +276,34 @@ static int pcmcia_device_probe(struct device * dev)
        ret = pccard_read_tuple(p_dev->socket, p_dev->func, CISTPL_CONFIG,
                                &cis_config);
        if (!ret) {
-               p_dev->conf.ConfigBase = cis_config.base;
-               p_dev->conf.Present = cis_config.rmask[0];
+               p_dev->config_base = cis_config.base;
+               p_dev->config_regs = cis_config.rmask[0];
+               dev_dbg(dev, "base %x, regs %x", p_dev->config_base,
+                       p_dev->config_regs);
        } else {
                dev_printk(KERN_INFO, dev,
                           "pcmcia: could not parse base and rmask0 of CIS\n");
-               p_dev->conf.ConfigBase = 0;
-               p_dev->conf.Present = 0;
+               p_dev->config_base = 0;
+               p_dev->config_regs = 0;
        }
 
        ret = p_drv->probe(p_dev);
        if (ret) {
-               ds_dev_dbg(1, dev, "binding to %s failed with %d\n",
-                          p_drv->drv.name, ret);
+               dev_dbg(dev, "binding to %s failed with %d\n",
+                          p_drv->name, ret);
                goto put_module;
        }
-
-       if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
+       dev_dbg(dev, "%s bound: Vpp %d.%d, idx %x, IRQ %d", p_drv->name,
+               p_dev->vpp/10, p_dev->vpp%10, p_dev->config_index, p_dev->irq);
+       dev_dbg(dev, "resources: ioport %pR %pR iomem %pR %pR %pR",
+               p_dev->resource[0], p_dev->resource[1], p_dev->resource[2],
+               p_dev->resource[3], p_dev->resource[4]);
+
+       mutex_lock(&s->ops_mutex);
+       if ((s->pcmcia_pfc) &&
            (p_dev->socket->device_count == 1) && (p_dev->device_no == 0))
-               pcmcia_add_device_later(p_dev->socket, 0);
+               pcmcia_parse_uevents(s, PCMCIA_UEVENT_REQUERY);
+       mutex_unlock(&s->ops_mutex);
 
 put_module:
        if (ret)
@@ -443,7 +311,7 @@ put_module:
 put_dev:
        if (ret)
                put_device(dev);
-       return (ret);
+       return ret;
 }
 
 
@@ -454,53 +322,51 @@ static void pcmcia_card_remove(struct pcmcia_socket *s, struct pcmcia_device *le
 {
        struct pcmcia_device    *p_dev;
        struct pcmcia_device    *tmp;
-       unsigned long           flags;
 
-       ds_dev_dbg(2, leftover ? &leftover->dev : &s->dev,
+       dev_dbg(leftover ? &leftover->dev : &s->dev,
                   "pcmcia_card_remove(%d) %s\n", s->sock,
                   leftover ? leftover->devname : "");
 
+       mutex_lock(&s->ops_mutex);
        if (!leftover)
                s->device_count = 0;
        else
                s->device_count = 1;
+       mutex_unlock(&s->ops_mutex);
 
        /* unregister all pcmcia_devices registered with this socket, except leftover */
        list_for_each_entry_safe(p_dev, tmp, &s->devices_list, socket_device_list) {
                if (p_dev == leftover)
                        continue;
 
-               spin_lock_irqsave(&pcmcia_dev_list_lock, flags);
+               mutex_lock(&s->ops_mutex);
                list_del(&p_dev->socket_device_list);
-               p_dev->_removed=1;
-               spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);
+               mutex_unlock(&s->ops_mutex);
 
-               ds_dev_dbg(2, &p_dev->dev, "unregistering device\n");
+               dev_dbg(&p_dev->dev, "unregistering device\n");
                device_unregister(&p_dev->dev);
        }
 
        return;
 }
 
-static int pcmcia_device_remove(struct device * dev)
+static int pcmcia_device_remove(struct device *dev)
 {
        struct pcmcia_device *p_dev;
        struct pcmcia_driver *p_drv;
-       struct pcmcia_device_id *did;
        int i;
 
        p_dev = to_pcmcia_dev(dev);
        p_drv = to_pcmcia_drv(dev->driver);
 
-       ds_dev_dbg(1, dev, "removing device\n");
+       dev_dbg(dev, "removing device\n");
 
        /* If we're removing the primary module driving a
         * pseudo multi-function card, we need to unbind
         * all devices
         */
-       did = dev_get_drvdata(&p_dev->dev);
-       if (did && (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
-           (p_dev->socket->device_count != 0) &&
+       if ((p_dev->socket->pcmcia_pfc) &&
+           (p_dev->socket->device_count > 0) &&
            (p_dev->device_no == 0))
                pcmcia_card_remove(p_dev->socket, p_dev);
 
@@ -509,21 +375,19 @@ static int pcmcia_device_remove(struct device * dev)
                return 0;
 
        if (p_drv->remove)
-               p_drv->remove(p_dev);
-
-       p_dev->dev_node = NULL;
+               p_drv->remove(p_dev);
 
        /* check for proper unloading */
        if (p_dev->_irq || p_dev->_io || p_dev->_locked)
                dev_printk(KERN_INFO, dev,
                        "pcmcia: driver %s did not release config properly\n",
-                       p_drv->drv.name);
+                       p_drv->name);
 
        for (i = 0; i < MAX_WIN; i++)
                if (p_dev->_win & CLIENT_WIN_REQ(i))
                        dev_printk(KERN_INFO, dev,
                          "pcmcia: driver %s did not release window properly\n",
-                          p_drv->drv.name);
+                          p_drv->name);
 
        /* references from pcmcia_probe_device */
        pcmcia_put_dev(p_dev);
@@ -547,18 +411,22 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev)
        if (!vers1)
                return -ENOMEM;
 
-       if (!pccard_read_tuple(p_dev->socket, p_dev->func,
+       if (!pccard_read_tuple(p_dev->socket, BIND_FN_ALL,
                               CISTPL_MANFID, &manf_id)) {
+               mutex_lock(&p_dev->socket->ops_mutex);
                p_dev->manf_id = manf_id.manf;
                p_dev->card_id = manf_id.card;
                p_dev->has_manf_id = 1;
                p_dev->has_card_id = 1;
+               mutex_unlock(&p_dev->socket->ops_mutex);
        }
 
        if (!pccard_read_tuple(p_dev->socket, p_dev->func,
                               CISTPL_FUNCID, &func_id)) {
+               mutex_lock(&p_dev->socket->ops_mutex);
                p_dev->func_id = func_id.func;
                p_dev->has_func_id = 1;
+               mutex_unlock(&p_dev->socket->ops_mutex);
        } else {
                /* rule of thumb: cards with no FUNCID, but with
                 * common memory device geometry information, are
@@ -572,20 +440,24 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev)
                }
                if (!pccard_read_tuple(p_dev->socket, p_dev->func,
                                      CISTPL_DEVICE_GEO, devgeo)) {
-                       ds_dev_dbg(0, &p_dev->dev,
+                       dev_dbg(&p_dev->dev,
                                   "mem device geometry probably means "
                                   "FUNCID_MEMORY\n");
+                       mutex_lock(&p_dev->socket->ops_mutex);
                        p_dev->func_id = CISTPL_FUNCID_MEMORY;
                        p_dev->has_func_id = 1;
+                       mutex_unlock(&p_dev->socket->ops_mutex);
                }
                kfree(devgeo);
        }
 
-       if (!pccard_read_tuple(p_dev->socket, p_dev->func, CISTPL_VERS_1,
+       if (!pccard_read_tuple(p_dev->socket, BIND_FN_ALL, CISTPL_VERS_1,
                               vers1)) {
-               for (i=0; i < vers1->ns; i++) {
+               mutex_lock(&p_dev->socket->ops_mutex);
+               for (i = 0; i < min_t(unsigned int, 4, vers1->ns); i++) {
                        char *tmp;
                        unsigned int length;
+                       char *new;
 
                        tmp = vers1->str + vers1->ofs[i];
 
@@ -593,14 +465,17 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev)
                        if ((length < 2) || (length > 255))
                                continue;
 
-                       p_dev->prod_id[i] = kmalloc(sizeof(char) * length,
-                                                   GFP_KERNEL);
-                       if (!p_dev->prod_id[i])
+                       new = kmalloc(sizeof(char) * length, GFP_KERNEL);
+                       if (!new)
                                continue;
 
-                       p_dev->prod_id[i] = strncpy(p_dev->prod_id[i],
-                                                   tmp, length);
+                       new = strncpy(new, tmp, length);
+
+                       tmp = p_dev->prod_id[i];
+                       p_dev->prod_id[i] = new;
+                       kfree(tmp);
                }
+               mutex_unlock(&p_dev->socket->ops_mutex);
        }
 
        kfree(vers1);
@@ -608,38 +483,35 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev)
 }
 
 
-/* device_add_lock is needed to avoid double registration by cardmgr and kernel.
- * Serializes pcmcia_device_add; will most likely be removed in future.
- *
- * While it has the caveat that adding new PCMCIA devices inside(!) device_register()
- * won't work, this doesn't matter much at the moment: the driver core doesn't
- * support it either.
- */
-static DEFINE_MUTEX(device_add_lock);
-
-struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int function)
+static struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s,
+                                              unsigned int function)
 {
        struct pcmcia_device *p_dev, *tmp_dev;
-       unsigned long flags;
+       int i;
 
        s = pcmcia_get_socket(s);
        if (!s)
                return NULL;
 
-       mutex_lock(&device_add_lock);
-
-       ds_dbg(3, "adding device to %d, function %d\n", s->sock, function);
-
-       /* max of 4 devices per card */
-       if (s->device_count == 4)
-               goto err_put;
+       pr_debug("adding device to %d, function %d\n", s->sock, function);
 
        p_dev = kzalloc(sizeof(struct pcmcia_device), GFP_KERNEL);
        if (!p_dev)
                goto err_put;
 
-       p_dev->socket = s;
+       mutex_lock(&s->ops_mutex);
        p_dev->device_no = (s->device_count++);
+       mutex_unlock(&s->ops_mutex);
+
+       /* max of 2 PFC devices */
+       if ((p_dev->device_no >= 2) && (function == 0))
+               goto err_free;
+
+       /* max of 4 devices overall */
+       if (p_dev->device_no >= 4)
+               goto err_free;
+
+       p_dev->socket = s;
        p_dev->func   = function;
 
        p_dev->dev.bus = &pcmcia_bus_type;
@@ -654,19 +526,18 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
        p_dev->devname = kasprintf(GFP_KERNEL, "pcmcia%s", dev_name(&p_dev->dev));
        if (!p_dev->devname)
                goto err_free;
-       ds_dev_dbg(3, &p_dev->dev, "devname is %s\n", p_dev->devname);
+       dev_dbg(&p_dev->dev, "devname is %s\n", p_dev->devname);
 
-       spin_lock_irqsave(&pcmcia_dev_list_lock, flags);
+       mutex_lock(&s->ops_mutex);
 
        /*
         * p_dev->function_config must be the same for all card functions.
-        * Note that this is serialized by the device_add_lock, so that
-        * only one such struct will be created.
+        * Note that this is serialized by ops_mutex, so that only one
+        * such struct will be created.
         */
-        list_for_each_entry(tmp_dev, &s->devices_list, socket_device_list)
-                if (p_dev->func == tmp_dev->func) {
+       list_for_each_entry(tmp_dev, &s->devices_list, socket_device_list)
+               if (p_dev->func == tmp_dev->func) {
                        p_dev->function_config = tmp_dev->function_config;
-                       p_dev->io = tmp_dev->io;
                        p_dev->irq = tmp_dev->irq;
                        kref_get(&p_dev->function_config->ref);
                }
@@ -674,41 +545,62 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
        /* Add to the list in pcmcia_bus_socket */
        list_add(&p_dev->socket_device_list, &s->devices_list);
 
-       spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);
+       if (pcmcia_setup_irq(p_dev))
+               dev_warn(&p_dev->dev,
+                       "IRQ setup failed -- device might not work\n");
 
        if (!p_dev->function_config) {
-               ds_dev_dbg(3, &p_dev->dev, "creating config_t\n");
-               p_dev->function_config = kzalloc(sizeof(struct config_t),
-                                                GFP_KERNEL);
-               if (!p_dev->function_config)
+               config_t *c;
+               dev_dbg(&p_dev->dev, "creating config_t\n");
+               c = kzalloc(sizeof(struct config_t), GFP_KERNEL);
+               if (!c) {
+                       mutex_unlock(&s->ops_mutex);
                        goto err_unreg;
-               kref_init(&p_dev->function_config->ref);
+               }
+               p_dev->function_config = c;
+               kref_init(&c->ref);
+               for (i = 0; i < MAX_IO_WIN; i++) {
+                       c->io[i].name = p_dev->devname;
+                       c->io[i].flags = IORESOURCE_IO;
+               }
+               for (i = 0; i< MAX_WIN; i++) {
+                       c->mem[i].name = p_dev->devname;
+                       c->mem[i].flags = IORESOURCE_MEM;
+               }
        }
+       for (i = 0; i < MAX_IO_WIN; i++)
+               p_dev->resource[i] = &p_dev->function_config->io[i];
+       for (; i < (MAX_IO_WIN + MAX_WIN); i++)
+               p_dev->resource[i] = &p_dev->function_config->mem[i-MAX_IO_WIN];
+
+       mutex_unlock(&s->ops_mutex);
 
        dev_printk(KERN_NOTICE, &p_dev->dev,
-                  "pcmcia: registering new device %s\n",
-                  p_dev->devname);
+                  "pcmcia: registering new device %s (IRQ: %d)\n",
+                  p_dev->devname, p_dev->irq);
 
        pcmcia_device_query(p_dev);
 
        if (device_register(&p_dev->dev))
                goto err_unreg;
 
-       mutex_unlock(&device_add_lock);
-
        return p_dev;
 
  err_unreg:
-       spin_lock_irqsave(&pcmcia_dev_list_lock, flags);
+       mutex_lock(&s->ops_mutex);
        list_del(&p_dev->socket_device_list);
-       spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);
+       mutex_unlock(&s->ops_mutex);
 
  err_free:
+       mutex_lock(&s->ops_mutex);
+       s->device_count--;
+       mutex_unlock(&s->ops_mutex);
+
+       for (i = 0; i < 4; i++)
+               kfree(p_dev->prod_id[i]);
        kfree(p_dev->devname);
        kfree(p_dev);
-       s->device_count--;
  err_put:
-       mutex_unlock(&device_add_lock);
        pcmcia_put_socket(s);
 
        return NULL;
@@ -719,23 +611,27 @@ static int pcmcia_card_add(struct pcmcia_socket *s)
 {
        cistpl_longlink_mfc_t mfc;
        unsigned int no_funcs, i, no_chains;
-       int ret = 0;
+       int ret = -EAGAIN;
 
+       mutex_lock(&s->ops_mutex);
        if (!(s->resource_setup_done)) {
-               ds_dev_dbg(3, &s->dev,
+               dev_dbg(&s->dev,
                           "no resources available, delaying card_add\n");
+               mutex_unlock(&s->ops_mutex);
                return -EAGAIN; /* try again, but later... */
        }
 
        if (pcmcia_validate_mem(s)) {
-               ds_dev_dbg(3, &s->dev, "validating mem resources failed, "
+               dev_dbg(&s->dev, "validating mem resources failed, "
                       "delaying card_add\n");
+               mutex_unlock(&s->ops_mutex);
                return -EAGAIN; /* try again, but later... */
        }
+       mutex_unlock(&s->ops_mutex);
 
-       ret = pccard_validate_cis(s, BIND_FN_ALL, &no_chains);
+       ret = pccard_validate_cis(s, &no_chains);
        if (ret || !no_chains) {
-               ds_dev_dbg(0, &s->dev, "invalid CIS or invalid resources\n");
+               dev_dbg(&s->dev, "invalid CIS or invalid resources\n");
                return -ENODEV;
        }
 
@@ -745,73 +641,77 @@ static int pcmcia_card_add(struct pcmcia_socket *s)
                no_funcs = 1;
        s->functions = no_funcs;
 
-       for (i=0; i < no_funcs; i++)
+       for (i = 0; i < no_funcs; i++)
                pcmcia_device_add(s, i);
 
-       return (ret);
+       return ret;
 }
 
 
-static void pcmcia_delayed_add_device(struct work_struct *work)
-{
-       struct pcmcia_socket *s =
-               container_of(work, struct pcmcia_socket, device_add);
-       ds_dev_dbg(1, &s->dev, "adding additional device to %d\n", s->sock);
-       pcmcia_device_add(s, s->pcmcia_state.mfc_pfc);
-       s->pcmcia_state.device_add_pending = 0;
-       s->pcmcia_state.mfc_pfc = 0;
-}
-
-static int pcmcia_requery(struct device *dev, void * _data)
+static int pcmcia_requery_callback(struct device *dev, void * _data)
 {
        struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
        if (!p_dev->dev.driver) {
-               ds_dev_dbg(1, dev, "update device information\n");
+               dev_dbg(dev, "update device information\n");
                pcmcia_device_query(p_dev);
        }
 
        return 0;
 }
 
-static void pcmcia_bus_rescan(struct pcmcia_socket *skt, int new_cis)
-{
-       int no_devices = 0;
-       int ret = 0;
-       unsigned long flags;
-
-       /* must be called with skt_mutex held */
-       ds_dev_dbg(0, &skt->dev, "re-scanning socket %d\n", skt->sock);
-
-       spin_lock_irqsave(&pcmcia_dev_list_lock, flags);
-       if (list_empty(&skt->devices_list))
-               no_devices = 1;
-       spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);
 
-       /* If this is because of a CIS override, start over */
-       if (new_cis && !no_devices)
-               pcmcia_card_remove(skt, NULL);
+static void pcmcia_requery(struct pcmcia_socket *s)
+{
+       int has_pfc;
 
-       /* if no devices were added for this socket yet because of
-        * missing resource information or other trouble, we need to
-        * do this now. */
-       if (no_devices || new_cis) {
-               ret = pcmcia_card_add(skt);
-               if (ret)
-                       return;
+       if (s->functions == 0) {
+               pcmcia_card_add(s);
+               return;
        }
 
        /* some device information might have changed because of a CIS
         * update or because we can finally read it correctly... so
         * determine it again, overwriting old values if necessary. */
-       bus_for_each_dev(&pcmcia_bus_type, NULL, NULL, pcmcia_requery);
+       bus_for_each_dev(&pcmcia_bus_type, NULL, NULL, pcmcia_requery_callback);
+
+       /* if the CIS changed, we need to check whether the number of
+        * functions changed. */
+       if (s->fake_cis) {
+               int old_funcs, new_funcs;
+               cistpl_longlink_mfc_t mfc;
+
+               /* does this cis override add or remove functions? */
+               old_funcs = s->functions;
+
+               if (!pccard_read_tuple(s, BIND_FN_ALL, CISTPL_LONGLINK_MFC,
+                                       &mfc))
+                       new_funcs = mfc.nfn;
+               else
+                       new_funcs = 1;
+               if (old_funcs != new_funcs) {
+                       /* we need to re-start */
+                       pcmcia_card_remove(s, NULL);
+                       s->functions = 0;
+                       pcmcia_card_add(s);
+               }
+       }
+
+       /* If the PCMCIA device consists of two pseudo devices,
+        * call pcmcia_device_add() -- which will fail if both
+        * devices are already registered. */
+       mutex_lock(&s->ops_mutex);
+       has_pfc = s->pcmcia_pfc;
+       mutex_unlock(&s->ops_mutex);
+       if (has_pfc)
+               pcmcia_device_add(s, 0);
 
        /* we re-scan all devices, not just the ones connected to this
         * socket. This does not matter, though. */
-       ret = bus_rescan_devices(&pcmcia_bus_type);
-       if (ret)
-               printk(KERN_INFO "pcmcia: bus_rescan_devices failed\n");
+       if (bus_rescan_devices(&pcmcia_bus_type))
+               dev_warn(&s->dev, "rescanning the bus failed\n");
 }
 
+
 #ifdef CONFIG_PCMCIA_LOAD_CIS
 
 /**
@@ -828,14 +728,13 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
        struct pcmcia_socket *s = dev->socket;
        const struct firmware *fw;
        int ret = -ENOMEM;
-       int no_funcs;
-       int old_funcs;
        cistpl_longlink_mfc_t mfc;
+       int old_funcs, new_funcs = 1;
 
        if (!filename)
                return -EINVAL;
 
-       ds_dev_dbg(1, &dev->dev, "trying to load CIS file %s\n", filename);
+       dev_dbg(&dev->dev, "trying to load CIS file %s\n", filename);
 
        if (request_firmware(&fw, filename, &dev->dev) == 0) {
                if (fw->size >= CISTPL_MAX_CIS_SIZE) {
@@ -853,28 +752,25 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
                        goto release;
                }
 
+               /* we need to re-start if the number of functions changed */
+               old_funcs = s->functions;
+               if (!pccard_read_tuple(s, BIND_FN_ALL, CISTPL_LONGLINK_MFC,
+                                       &mfc))
+                       new_funcs = mfc.nfn;
+
+               if (old_funcs != new_funcs)
+                       ret = -EBUSY;
 
                /* update information */
                pcmcia_device_query(dev);
 
-               /* does this cis override add or remove functions? */
-               old_funcs = s->functions;
-
-               if (!pccard_read_tuple(s, BIND_FN_ALL, CISTPL_LONGLINK_MFC, &mfc))
-                       no_funcs = mfc.nfn;
-               else
-                       no_funcs = 1;
-               s->functions = no_funcs;
-
-               if (old_funcs > no_funcs)
-                       pcmcia_card_remove(s, dev);
-               else if (no_funcs > old_funcs)
-                       pcmcia_add_device_later(s, 1);
+               /* requery (as number of functions might have changed) */
+               pcmcia_parse_uevents(s, PCMCIA_UEVENT_REQUERY);
        }
  release:
        release_firmware(fw);
 
-       return (ret);
+       return ret;
 }
 
 #else /* !CONFIG_PCMCIA_LOAD_CIS */
@@ -888,7 +784,7 @@ static inline int pcmcia_load_firmware(struct pcmcia_device *dev, char * filenam
 
 
 static inline int pcmcia_devmatch(struct pcmcia_device *dev,
-                                 struct pcmcia_device_id *did)
+                                 const struct pcmcia_device_id *did)
 {
        if (did->match_flags & PCMCIA_DEV_ID_MATCH_MANF_ID) {
                if ((!dev->has_manf_id) || (dev->manf_id != did->manf_id))
@@ -934,17 +830,23 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
        }
 
        if (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) {
+               dev_dbg(&dev->dev, "this is a pseudo-multi-function device\n");
+               mutex_lock(&dev->socket->ops_mutex);
+               dev->socket->pcmcia_pfc = 1;
+               mutex_unlock(&dev->socket->ops_mutex);
                if (dev->device_no != did->device_no)
                        return 0;
        }
 
        if (did->match_flags & PCMCIA_DEV_ID_MATCH_FUNC_ID) {
+               int ret;
+
                if ((!dev->has_func_id) || (dev->func_id != did->func_id))
                        return 0;
 
                /* if this is a pseudo-multi-function device,
                 * we need explicit matches */
-               if (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO)
+               if (dev->socket->pcmcia_pfc)
                        return 0;
                if (dev->device_no)
                        return 0;
@@ -953,66 +855,60 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
                 * after it has re-checked that there is no possible module
                 * with a prod_id/manf_id/card_id match.
                 */
-               ds_dev_dbg(0, &dev->dev,
-                       "skipping FUNC_ID match until userspace interaction\n");
-               if (!dev->allow_func_id_match)
+               mutex_lock(&dev->socket->ops_mutex);
+               ret = dev->allow_func_id_match;
+               mutex_unlock(&dev->socket->ops_mutex);
+
+               if (!ret) {
+                       dev_dbg(&dev->dev,
+                               "skipping FUNC_ID match until userspace ACK\n");
                        return 0;
+               }
        }
 
        if (did->match_flags & PCMCIA_DEV_ID_MATCH_FAKE_CIS) {
-               ds_dev_dbg(0, &dev->dev, "device needs a fake CIS\n");
+               dev_dbg(&dev->dev, "device needs a fake CIS\n");
                if (!dev->socket->fake_cis)
-                       pcmcia_load_firmware(dev, did->cisfile);
-
-               if (!dev->socket->fake_cis)
-                       return 0;
+                       if (pcmcia_load_firmware(dev, did->cisfile))
+                               return 0;
        }
 
        if (did->match_flags & PCMCIA_DEV_ID_MATCH_ANONYMOUS) {
                int i;
-               for (i=0; i<4; i++)
+               for (i = 0; i < 4; i++)
                        if (dev->prod_id[i])
                                return 0;
                if (dev->has_manf_id || dev->has_card_id || dev->has_func_id)
                        return 0;
        }
 
-       dev_set_drvdata(&dev->dev, did);
-
        return 1;
 }
 
 
-static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) {
-       struct pcmcia_device * p_dev = to_pcmcia_dev(dev);
-       struct pcmcia_driver * p_drv = to_pcmcia_drv(drv);
-       struct pcmcia_device_id *did = p_drv->id_table;
+static int pcmcia_bus_match(struct device *dev, struct device_driver *drv)
+{
+       struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
+       struct pcmcia_driver *p_drv = to_pcmcia_drv(drv);
+       const struct pcmcia_device_id *did = p_drv->id_table;
        struct pcmcia_dynid *dynid;
 
        /* match dynamic devices first */
-       spin_lock(&p_drv->dynids.lock);
+       mutex_lock(&p_drv->dynids.lock);
        list_for_each_entry(dynid, &p_drv->dynids.list, node) {
-               ds_dev_dbg(3, dev, "trying to match to %s\n", drv->name);
+               dev_dbg(dev, "trying to match to %s\n", drv->name);
                if (pcmcia_devmatch(p_dev, &dynid->id)) {
-                       ds_dev_dbg(0, dev, "matched to %s\n", drv->name);
-                       spin_unlock(&p_drv->dynids.lock);
+                       dev_dbg(dev, "matched to %s\n", drv->name);
+                       mutex_unlock(&p_drv->dynids.lock);
                        return 1;
                }
        }
-       spin_unlock(&p_drv->dynids.lock);
-
-#ifdef CONFIG_PCMCIA_IOCTL
-       /* matching by cardmgr */
-       if (p_dev->cardmgr == p_drv) {
-               ds_dev_dbg(0, dev, "cardmgr matched to %s\n", drv->name);
-               return 1;
-       }
-#endif
+       mutex_unlock(&p_drv->dynids.lock);
 
        while (did && did->match_flags) {
-               ds_dev_dbg(3, dev, "trying to match to %s\n", drv->name);
+               dev_dbg(dev, "trying to match to %s\n", drv->name);
                if (pcmcia_devmatch(p_dev, did)) {
-                       ds_dev_dbg(0, dev, "matched to %s\n", drv->name);
+                       dev_dbg(dev, "matched to %s\n", drv->name);
                        return 1;
                }
                did++;
@@ -1035,7 +931,7 @@ static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
        p_dev = to_pcmcia_dev(dev);
 
        /* calculate hashes */
-       for (i=0; i<4; i++) {
+       for (i = 0; i < 4; i++) {
                if (!p_dev->prod_id[i])
                        continue;
                hash[i] = crc32(0, p_dev->prod_id[i], strlen(p_dev->prod_id[i]));
@@ -1081,19 +977,20 @@ static int runtime_suspend(struct device *dev)
 {
        int rc;
 
-       down(&dev->sem);
+       device_lock(dev);
        rc = pcmcia_dev_suspend(dev, PMSG_SUSPEND);
-       up(&dev->sem);
+       device_unlock(dev);
        return rc;
 }
 
-static void runtime_resume(struct device *dev)
+static int runtime_resume(struct device *dev)
 {
        int rc;
 
-       down(&dev->sem);
+       device_lock(dev);
        rc = pcmcia_dev_resume(dev);
-       up(&dev->sem);
+       device_unlock(dev);
+       return rc;
 }
 
 /************************ per-device sysfs output ***************************/
@@ -1102,14 +999,14 @@ static void runtime_resume(struct device *dev)
 static ssize_t field##_show (struct device *dev, struct device_attribute *attr, char *buf)             \
 {                                                                      \
        struct pcmcia_device *p_dev = to_pcmcia_dev(dev);               \
-       return p_dev->test ? sprintf (buf, format, p_dev->field) : -ENODEV; \
+       return p_dev->test ? sprintf(buf, format, p_dev->field) : -ENODEV; \
 }
 
 #define pcmcia_device_stringattr(name, field)                                  \
 static ssize_t name##_show (struct device *dev, struct device_attribute *attr, char *buf)              \
 {                                                                      \
        struct pcmcia_device *p_dev = to_pcmcia_dev(dev);               \
-       return p_dev->field ? sprintf (buf, "%s\n", p_dev->field) : -ENODEV; \
+       return p_dev->field ? sprintf(buf, "%s\n", p_dev->field) : -ENODEV; \
 }
 
 pcmcia_device_attr(func, socket, "0x%02x\n");
@@ -1121,6 +1018,18 @@ pcmcia_device_stringattr(prod_id2, prod_id[1]);
 pcmcia_device_stringattr(prod_id3, prod_id[2]);
 pcmcia_device_stringattr(prod_id4, prod_id[3]);
 
+static ssize_t pcmcia_show_resources(struct device *dev,
+                                    struct device_attribute *attr, char *buf)
+{
+       struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
+       char *str = buf;
+       int i;
+
+       for (i = 0; i < PCMCIA_NUM_RESOURCES; i++)
+               str += sprintf(str, "%pr\n", p_dev->resource[i]);
+
+       return str - buf;
+}
 
 static ssize_t pcmcia_show_pm_state(struct device *dev, struct device_attribute *attr, char *buf)
 {
@@ -1138,13 +1047,13 @@ static ssize_t pcmcia_store_pm_state(struct device *dev, struct device_attribute
        struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
        int ret = 0;
 
-        if (!count)
-                return -EINVAL;
+       if (!count)
+               return -EINVAL;
 
        if ((!p_dev->suspended) && !strncmp(buf, "off", 3))
                ret = runtime_suspend(dev);
        else if (p_dev->suspended && !strncmp(buf, "on", 2))
-               runtime_resume(dev);
+               ret = runtime_resume(dev);
 
        return ret ? ret : count;
 }
@@ -1157,10 +1066,11 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
        u32 hash[4] = { 0, 0, 0, 0};
 
        /* calculate hashes */
-       for (i=0; i<4; i++) {
+       for (i = 0; i < 4; i++) {
                if (!p_dev->prod_id[i])
                        continue;
-               hash[i] = crc32(0,p_dev->prod_id[i],strlen(p_dev->prod_id[i]));
+               hash[i] = crc32(0, p_dev->prod_id[i],
+                               strlen(p_dev->prod_id[i]));
        }
        return sprintf(buf, "pcmcia:m%04Xc%04Xf%02Xfn%02Xpfn%02X"
                                "pa%08Xpb%08Xpc%08Xpd%08X\n",
@@ -1175,19 +1085,14 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,
                struct device_attribute *attr, const char *buf, size_t count)
 {
        struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
-       int ret;
 
        if (!count)
                return -EINVAL;
 
-       mutex_lock(&p_dev->socket->skt_mutex);
+       mutex_lock(&p_dev->socket->ops_mutex);
        p_dev->allow_func_id_match = 1;
-       mutex_unlock(&p_dev->socket->skt_mutex);
-
-       ret = bus_rescan_devices(&pcmcia_bus_type);
-       if (ret)
-               printk(KERN_INFO "pcmcia: bus_rescan_devices failed after "
-                      "allowing func_id matches\n");
+       mutex_unlock(&p_dev->socket->ops_mutex);
+       pcmcia_parse_uevents(p_dev->socket, PCMCIA_UEVENT_REQUERY);
 
        return count;
 }
@@ -1195,6 +1100,7 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,
 static struct device_attribute pcmcia_dev_attrs[] = {
        __ATTR(function, 0444, func_show, NULL),
        __ATTR(pm_state, 0644, pcmcia_show_pm_state, pcmcia_store_pm_state),
+       __ATTR(resources, 0444, pcmcia_show_resources, NULL),
        __ATTR_RO(func_id),
        __ATTR_RO(manf_id),
        __ATTR_RO(card_id),
@@ -1209,16 +1115,21 @@ static struct device_attribute pcmcia_dev_attrs[] = {
 
 /* PM support, also needed for reset */
 
-static int pcmcia_dev_suspend(struct device * dev, pm_message_t state)
+static int pcmcia_dev_suspend(struct device *dev, pm_message_t state)
 {
        struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
        struct pcmcia_driver *p_drv = NULL;
        int ret = 0;
 
-       if (p_dev->suspended)
+       mutex_lock(&p_dev->socket->ops_mutex);
+       if (p_dev->suspended) {
+               mutex_unlock(&p_dev->socket->ops_mutex);
                return 0;
+       }
+       p_dev->suspended = 1;
+       mutex_unlock(&p_dev->socket->ops_mutex);
 
-       ds_dev_dbg(2, dev, "suspending\n");
+       dev_dbg(dev, "suspending\n");
 
        if (dev->driver)
                p_drv = to_pcmcia_drv(dev->driver);
@@ -1232,33 +1143,39 @@ static int pcmcia_dev_suspend(struct device * dev, pm_message_t state)
                        dev_printk(KERN_ERR, dev,
                                   "pcmcia: device %s (driver %s) did "
                                   "not want to go to sleep (%d)\n",
-                                  p_dev->devname, p_drv->drv.name, ret);
+                                  p_dev->devname, p_drv->name, ret);
+                       mutex_lock(&p_dev->socket->ops_mutex);
+                       p_dev->suspended = 0;
+                       mutex_unlock(&p_dev->socket->ops_mutex);
                        goto out;
                }
        }
 
        if (p_dev->device_no == p_dev->func) {
-               ds_dev_dbg(2, dev, "releasing configuration\n");
+               dev_dbg(dev, "releasing configuration\n");
                pcmcia_release_configuration(p_dev);
        }
 
  out:
-       if (!ret)
-               p_dev->suspended = 1;
        return ret;
 }
 
 
-static int pcmcia_dev_resume(struct device * dev)
+static int pcmcia_dev_resume(struct device *dev)
 {
        struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
-        struct pcmcia_driver *p_drv = NULL;
+       struct pcmcia_driver *p_drv = NULL;
        int ret = 0;
 
-       if (!p_dev->suspended)
+       mutex_lock(&p_dev->socket->ops_mutex);
+       if (!p_dev->suspended) {
+               mutex_unlock(&p_dev->socket->ops_mutex);
                return 0;
+       }
+       p_dev->suspended = 0;
+       mutex_unlock(&p_dev->socket->ops_mutex);
 
-       ds_dev_dbg(2, dev, "resuming\n");
+       dev_dbg(dev, "resuming\n");
 
        if (dev->driver)
                p_drv = to_pcmcia_drv(dev->driver);
@@ -1267,8 +1184,8 @@ static int pcmcia_dev_resume(struct device * dev)
                goto out;
 
        if (p_dev->device_no == p_dev->func) {
-               ds_dev_dbg(2, dev, "requesting configuration\n");
-               ret = pcmcia_request_configuration(p_dev, &p_dev->conf);
+               dev_dbg(dev, "requesting configuration\n");
+               ret = pcmcia_enable_device(p_dev);
                if (ret)
                        goto out;
        }
@@ -1277,8 +1194,6 @@ static int pcmcia_dev_resume(struct device * dev)
                ret = p_drv->resume(p_dev);
 
  out:
-       if (!ret)
-               p_dev->suspended = 0;
        return ret;
 }
 
@@ -1309,14 +1224,14 @@ static int pcmcia_bus_resume_callback(struct device *dev, void * _data)
 
 static int pcmcia_bus_resume(struct pcmcia_socket *skt)
 {
-       ds_dev_dbg(2, &skt->dev, "resuming socket %d\n", skt->sock);
+       dev_dbg(&skt->dev, "resuming socket %d\n", skt->sock);
        bus_for_each_dev(&pcmcia_bus_type, NULL, skt, pcmcia_bus_resume_callback);
        return 0;
 }
 
 static int pcmcia_bus_suspend(struct pcmcia_socket *skt)
 {
-       ds_dev_dbg(2, &skt->dev, "suspending socket %d\n", skt->sock);
+       dev_dbg(&skt->dev, "suspending socket %d\n", skt->sock);
        if (bus_for_each_dev(&pcmcia_bus_type, NULL, skt,
                             pcmcia_bus_suspend_callback)) {
                pcmcia_bus_resume(skt);
@@ -1325,64 +1240,66 @@ static int pcmcia_bus_suspend(struct pcmcia_socket *skt)
        return 0;
 }
 
+static int pcmcia_bus_remove(struct pcmcia_socket *skt)
+{
+       atomic_set(&skt->present, 0);
+       pcmcia_card_remove(skt, NULL);
 
-/*======================================================================
-
-    The card status event handler.
-    
-======================================================================*/
+       mutex_lock(&skt->ops_mutex);
+       destroy_cis_cache(skt);
+       pcmcia_cleanup_irq(skt);
+       mutex_unlock(&skt->ops_mutex);
 
-/* Normally, the event is passed to individual drivers after
- * informing userspace. Only for CS_EVENT_CARD_REMOVAL this
- * is inversed to maintain historic compatibility.
- */
+       return 0;
+}
 
-static int ds_event(struct pcmcia_socket *skt, event_t event, int priority)
+static int pcmcia_bus_add(struct pcmcia_socket *skt)
 {
-       struct pcmcia_socket *s = pcmcia_get_socket(skt);
+       atomic_set(&skt->present, 1);
 
-       if (!s) {
-               dev_printk(KERN_ERR, &skt->dev,
-                          "PCMCIA obtaining reference to socket "      \
-                          "failed, event 0x%x lost!\n", event);
-               return -ENODEV;
-       }
+       mutex_lock(&skt->ops_mutex);
+       skt->pcmcia_pfc = 0;
+       destroy_cis_cache(skt); /* to be on the safe side... */
+       mutex_unlock(&skt->ops_mutex);
 
-       ds_dev_dbg(1, &skt->dev, "ds_event(0x%06x, %d, 0x%p)\n",
-                  event, priority, skt);
+       pcmcia_card_add(skt);
 
-       switch (event) {
-       case CS_EVENT_CARD_REMOVAL:
-               s->pcmcia_state.present = 0;
-               pcmcia_card_remove(skt, NULL);
-               handle_event(skt, event);
-               break;
+       return 0;
+}
 
-       case CS_EVENT_CARD_INSERTION:
-               s->pcmcia_state.present = 1;
-               pcmcia_card_add(skt);
-               handle_event(skt, event);
-               break;
+static int pcmcia_bus_early_resume(struct pcmcia_socket *skt)
+{
+       if (!verify_cis_cache(skt)) {
+               pcmcia_put_socket(skt);
+               return 0;
+       }
 
-       case CS_EVENT_EJECTION_REQUEST:
-               break;
+       dev_dbg(&skt->dev, "cis mismatch - different card\n");
 
-       case CS_EVENT_PM_SUSPEND:
-       case CS_EVENT_PM_RESUME:
-       case CS_EVENT_RESET_PHYSICAL:
-       case CS_EVENT_CARD_RESET:
-       default:
-               handle_event(skt, event);
-               break;
-    }
+       /* first, remove the card */
+       pcmcia_bus_remove(skt);
 
-    pcmcia_put_socket(s);
+       mutex_lock(&skt->ops_mutex);
+       destroy_cis_cache(skt);
+       kfree(skt->fake_cis);
+       skt->fake_cis = NULL;
+       skt->functions = 0;
+       mutex_unlock(&skt->ops_mutex);
 
-    return 0;
-} /* ds_event */
+       /* now, add the new card */
+       pcmcia_bus_add(skt);
+       return 0;
+}
 
 
-struct pcmcia_device * pcmcia_dev_present(struct pcmcia_device *_p_dev)
+/*
+ * NOTE: This is racy. There's no guarantee the card will still be
+ * physically present, even if the call to this function returns
+ * non-NULL. Furthermore, the device driver most likely is unbound
+ * almost immediately, so the timeframe where pcmcia_dev_present
+ * returns NULL is probably really really small.
+ */
+struct pcmcia_device *pcmcia_dev_present(struct pcmcia_device *_p_dev)
 {
        struct pcmcia_device *p_dev;
        struct pcmcia_device *ret = NULL;
@@ -1391,17 +1308,9 @@ struct pcmcia_device * pcmcia_dev_present(struct pcmcia_device *_p_dev)
        if (!p_dev)
                return NULL;
 
-       if (!p_dev->socket->pcmcia_state.present)
-               goto out;
+       if (atomic_read(&p_dev->socket->present) != 0)
+               ret = p_dev;
 
-       if (p_dev->_removed)
-               goto out;
-
-       if (p_dev->suspended)
-               goto out;
-
-       ret = p_dev;
- out:
        pcmcia_put_dev(p_dev);
        return ret;
 }
@@ -1410,9 +1319,12 @@ EXPORT_SYMBOL(pcmcia_dev_present);
 
 static struct pcmcia_callback pcmcia_bus_callback = {
        .owner = THIS_MODULE,
-       .event = ds_event,
-       .requery = pcmcia_bus_rescan,
+       .add = pcmcia_bus_add,
+       .remove = pcmcia_bus_remove,
+       .requery = pcmcia_requery,
+       .validate = pccard_validate_cis,
        .suspend = pcmcia_bus_suspend,
+       .early_resume = pcmcia_bus_early_resume,
        .resume = pcmcia_bus_resume,
 };
 
@@ -1429,25 +1341,23 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev,
                return -ENODEV;
        }
 
-       /*
-        * Ugly. But we want to wait for the socket threads to have started up.
-        * We really should let the drivers themselves drive some of this..
-        */
-       msleep(250);
+       ret = sysfs_create_bin_file(&dev->kobj, &pccard_cis_attr);
+       if (ret) {
+               dev_printk(KERN_ERR, dev, "PCMCIA registration failed\n");
+               pcmcia_put_socket(socket);
+               return ret;
+       }
 
-#ifdef CONFIG_PCMCIA_IOCTL
-       init_waitqueue_head(&socket->queue);
-#endif
        INIT_LIST_HEAD(&socket->devices_list);
-       INIT_WORK(&socket->device_add, pcmcia_delayed_add_device);
-       memset(&socket->pcmcia_state, 0, sizeof(u8));
+       socket->pcmcia_pfc = 0;
        socket->device_count = 0;
+       atomic_set(&socket->present, 0);
 
        ret = pccard_register_pcmcia(socket, &pcmcia_bus_callback);
        if (ret) {
                dev_printk(KERN_ERR, dev, "PCMCIA registration failed\n");
                pcmcia_put_socket(socket);
-               return (ret);
+               return ret;
        }
 
        return 0;
@@ -1461,14 +1371,16 @@ static void pcmcia_bus_remove_socket(struct device *dev,
        if (!socket)
                return;
 
-       socket->pcmcia_state.dead = 1;
        pccard_register_pcmcia(socket, NULL);
 
        /* unregister any unbound devices */
        mutex_lock(&socket->skt_mutex);
        pcmcia_card_remove(socket, NULL);
+       release_cis_mem(socket);
        mutex_unlock(&socket->skt_mutex);
 
+       sysfs_remove_bin_file(&dev->kobj, &pccard_cis_attr);
+
        pcmcia_put_socket(socket);
 
        return;
@@ -1499,8 +1411,6 @@ static int __init init_pcmcia_bus(void)
 {
        int ret;
 
-       spin_lock_init(&pcmcia_dev_list_lock);
-
        ret = bus_register(&pcmcia_bus_type);
        if (ret < 0) {
                printk(KERN_WARNING "pcmcia: bus_register error: %d\n", ret);
@@ -1514,18 +1424,14 @@ static int __init init_pcmcia_bus(void)
                return ret;
        }
 
-       pcmcia_setup_ioctl();
-
        return 0;
 }
-fs_initcall(init_pcmcia_bus); /* one level after subsys_initcall so that 
+fs_initcall(init_pcmcia_bus); /* one level after subsys_initcall so that
                               * pcmcia_socket_class is already registered */
 
 
 static void __exit exit_pcmcia_bus(void)
 {
-       pcmcia_cleanup_ioctl();
-
        class_interface_unregister(&pcmcia_bus_interface);
 
        bus_unregister(&pcmcia_bus_type);