Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
  pcmcia: validate late-added resources
  pcmcia: allow for extension of resource interval
  pcmcia: remove useless msleep in ds.c
  pcmcia: use read_cis_mem return value
  pcmcia: handle error in serial_cs config calls
  pcmcia: add locking to pcmcia_{read,write}_cis_mem
  pcmcia: avoid prod_id memleak
  pcmcia: avoid sysfs-related lockup for cardbus
  pcmcia: use state machine for extended requery
  pcmcia: delay re-scanning and re-querying of PCMCIA bus
  pcmcia: use pccardd to handle eject, insert, suspend and resume requests
  pcmcia: use ops_mutex for rsrc_{mgr,nonstatic} locking
  pcmcia: use mutex for dynid lock
  pcmcia: assert locking to struct pcmcia_device
  pcmcia: add locking documentation
  pcmcia: simplify locking
  pcmcia: add locking to struct pcmcia_socket->pcmcia_state()
  pcmcia: protect s->device_count
  pcmcia: properly lock skt->irq, skt->irq_mask
  pcmcia: lock ops->set_socket
  ...

1 files changed, 21 insertions, 175 deletions

diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index 7a456000332a..08278016e58d 100644
--- a/drivers/pcmcia/socket_sysfs.c
+++ b/drivers/pcmcia/socket_sysfs.c
@@ -88,15 +88,14 @@ static DEVICE_ATTR(card_vcc, 0444, pccard_show_vcc, NULL);
 static ssize_t pccard_store_insert(struct device *dev, struct device_attribute *attr,
                                    const char *buf, size_t count)
 {
-        ssize_t ret;
         struct pcmcia_socket *s = to_socket(dev);
 
         if (!count)
                 return -EINVAL;
 
-        ret = pcmcia_insert_card(s);
+        pcmcia_parse_uevents(s, PCMCIA_UEVENT_INSERT);
 
-        return ret ? ret : count;
+        return count;
 }
 static DEVICE_ATTR(card_insert, 0200, NULL, pccard_store_insert);
 
@@ -113,18 +112,22 @@ static ssize_t pccard_store_card_pm_state(struct device *dev,
                                           struct device_attribute *attr,
                                           const char *buf, size_t count)
 {
-        ssize_t ret = -EINVAL;
         struct pcmcia_socket *s = to_socket(dev);
+        ssize_t ret = count;
 
         if (!count)
                 return -EINVAL;
 
-        if (!(s->state & SOCKET_SUSPEND) && !strncmp(buf, "off", 3))
-                ret = pcmcia_suspend_card(s);
-        else if ((s->state & SOCKET_SUSPEND) && !strncmp(buf, "on", 2))
-                ret = pcmcia_resume_card(s);
+        if (!strncmp(buf, "off", 3))
+                pcmcia_parse_uevents(s, PCMCIA_UEVENT_SUSPEND);
+        else {
+                if (!strncmp(buf, "on", 2))
+                        pcmcia_parse_uevents(s, PCMCIA_UEVENT_RESUME);
+                else
+                        ret = -EINVAL;
+        }
 
-        return ret ? -ENODEV : count;
+        return ret;
 }
 static DEVICE_ATTR(card_pm_state, 0644, pccard_show_card_pm_state, pccard_store_card_pm_state);
 
@@ -132,15 +135,14 @@ static ssize_t pccard_store_eject(struct device *dev,
                                   struct device_attribute *attr,
                                   const char *buf, size_t count)
 {
-        ssize_t ret;
         struct pcmcia_socket *s = to_socket(dev);
 
         if (!count)
                 return -EINVAL;
 
-        ret = pcmcia_eject_card(s);
+        pcmcia_parse_uevents(s, PCMCIA_UEVENT_EJECT);
 
-        return ret ? ret : count;
+        return count;
 }
 static DEVICE_ATTR(card_eject, 0200, NULL, pccard_store_eject);
 
@@ -167,7 +169,9 @@ static ssize_t pccard_store_irq_mask(struct device *dev,
         ret = sscanf(buf, "0x%x\n", &mask);
 
         if (ret == 1) {
+                mutex_lock(&s->ops_mutex);
                 s->irq_mask &= mask;
+                mutex_unlock(&s->ops_mutex);
                 ret = 0;
         }
 
@@ -187,163 +191,21 @@ static ssize_t pccard_store_resource(struct device *dev,
                                      struct device_attribute *attr,
                                      const char *buf, size_t count)
 {
-        unsigned long flags;
         struct pcmcia_socket *s = to_socket(dev);
 
         if (!count)
                 return -EINVAL;
 
-        spin_lock_irqsave(&s->lock, flags);
+        mutex_lock(&s->ops_mutex);
         if (!s->resource_setup_done)
                 s->resource_setup_done = 1;
-        spin_unlock_irqrestore(&s->lock, flags);
-
-        mutex_lock(&s->skt_mutex);
-        if ((s->callback) &&
-            (s->state & SOCKET_PRESENT) &&
-            !(s->state & SOCKET_CARDBUS)) {
-                if (try_module_get(s->callback->owner)) {
-                        s->callback->requery(s, 0);
-                        module_put(s->callback->owner);
-                }
-        }
-        mutex_unlock(&s->skt_mutex);
-
-        return count;
-}
-static DEVICE_ATTR(available_resources_setup_done, 0600, pccard_show_resource, pccard_store_resource);
+        mutex_unlock(&s->ops_mutex);
 
-
-static ssize_t pccard_extract_cis(struct pcmcia_socket *s, char *buf, loff_t off, size_t count)
-{
-        tuple_t tuple;
-        int status, i;
-        loff_t pointer = 0;
-        ssize_t ret = 0;
-        u_char *tuplebuffer;
-        u_char *tempbuffer;
-
-        tuplebuffer = kmalloc(sizeof(u_char) * 256, GFP_KERNEL);
-        if (!tuplebuffer)
-                return -ENOMEM;
-
-        tempbuffer = kmalloc(sizeof(u_char) * 258, GFP_KERNEL);
-        if (!tempbuffer) {
-                ret = -ENOMEM;
-                goto free_tuple;
-        }
-
-        memset(&tuple, 0, sizeof(tuple_t));
-
-        tuple.Attributes = TUPLE_RETURN_LINK | TUPLE_RETURN_COMMON;
-        tuple.DesiredTuple = RETURN_FIRST_TUPLE;
-        tuple.TupleOffset = 0;
-
-        status = pccard_get_first_tuple(s, BIND_FN_ALL, &tuple);
-        while (!status) {
-                tuple.TupleData = tuplebuffer;
-                tuple.TupleDataMax = 255;
-                memset(tuplebuffer, 0, sizeof(u_char) * 255);
-
-                status = pccard_get_tuple_data(s, &tuple);
-                if (status)
-                        break;
-
-                if (off < (pointer + 2 + tuple.TupleDataLen)) {
-                        tempbuffer[0] = tuple.TupleCode & 0xff;
-                        tempbuffer[1] = tuple.TupleLink & 0xff;
-                        for (i = 0; i < tuple.TupleDataLen; i++)
-                                tempbuffer[i + 2] = tuplebuffer[i] & 0xff;
-
-                        for (i = 0; i < (2 + tuple.TupleDataLen); i++) {
-                                if (((i + pointer) >= off) &&
-                                    (i + pointer) < (off + count)) {
-                                        buf[ret] = tempbuffer[i];
-                                        ret++;
-                                }
-                        }
-                }
-
-                pointer += 2 + tuple.TupleDataLen;
-
-                if (pointer >= (off + count))
-                        break;
-
-                if (tuple.TupleCode == CISTPL_END)
-                        break;
-                status = pccard_get_next_tuple(s, BIND_FN_ALL, &tuple);
-        }
-
-        kfree(tempbuffer);
- free_tuple:
-        kfree(tuplebuffer);
-
-        return ret;
-}
-
-static ssize_t pccard_show_cis(struct kobject *kobj,
-                               struct bin_attribute *bin_attr,
-                               char *buf, loff_t off, size_t count)
-{
-        unsigned int size = 0x200;
-
-        if (off >= size)
-                count = 0;
-        else {
-                struct pcmcia_socket *s;
-                unsigned int chains;
-
-                if (off + count > size)
-                        count = size - off;
-
-                s = to_socket(container_of(kobj, struct device, kobj));
-
-                if (!(s->state & SOCKET_PRESENT))
-                        return -ENODEV;
-                if (pccard_validate_cis(s, &chains))
-                        return -EIO;
-                if (!chains)
-                        return -ENODATA;
-
-                count = pccard_extract_cis(s, buf, off, count);
-        }
-
-        return count;
-}
-
-static ssize_t pccard_store_cis(struct kobject *kobj,
-                                struct bin_attribute *bin_attr,
-                                char *buf, loff_t off, size_t count)
-{
-        struct pcmcia_socket *s = to_socket(container_of(kobj, struct device, kobj));
-        int error;
-
-        if (off)
-                return -EINVAL;
-
-        if (count >= CISTPL_MAX_CIS_SIZE)
-                return -EINVAL;
-
-        if (!(s->state & SOCKET_PRESENT))
-                return -ENODEV;
-
-        error = pcmcia_replace_cis(s, buf, count);
-        if (error)
-                return -EIO;
-
-        mutex_lock(&s->skt_mutex);
-        if ((s->callback) && (s->state & SOCKET_PRESENT) &&
-            !(s->state & SOCKET_CARDBUS)) {
-                if (try_module_get(s->callback->owner)) {
-                        s->callback->requery(s, 1);
-                        module_put(s->callback->owner);
-                }
-        }
-        mutex_unlock(&s->skt_mutex);
+        pcmcia_parse_uevents(s, PCMCIA_UEVENT_REQUERY);
 
         return count;
 }
-
+static DEVICE_ATTR(available_resources_setup_done, 0600, pccard_show_resource, pccard_store_resource);
 
 static struct attribute *pccard_socket_attributes[] = {
         &dev_attr_card_type.attr,
@@ -362,28 +224,12 @@ static const struct attribute_group socket_attrs = {
         .attrs = pccard_socket_attributes,
 };
 
-static struct bin_attribute pccard_cis_attr = {
-        .attr = { .name = "cis", .mode = S_IRUGO | S_IWUSR },
-        .size = 0x200,
-        .read = pccard_show_cis,
-        .write = pccard_store_cis,
-};
-
 int pccard_sysfs_add_socket(struct device *dev)
 {
-        int ret = 0;
-
-        ret = sysfs_create_group(&dev->kobj, &socket_attrs);
-        if (!ret) {
-                ret = sysfs_create_bin_file(&dev->kobj, &pccard_cis_attr);
-                if (ret)
-                        sysfs_remove_group(&dev->kobj, &socket_attrs);
-        }
-        return ret;
+        return sysfs_create_group(&dev->kobj, &socket_attrs);
 }
 
 void pccard_sysfs_remove_socket(struct device *dev)
 {
-        sysfs_remove_bin_file(&dev->kobj, &pccard_cis_attr);
         sysfs_remove_group(&dev->kobj, &socket_attrs);
 }