Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[pandora-kernel.git] / drivers / pcmcia / socket_sysfs.c

diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index 4a3150a..933cd86 100644 (file)
--- a/drivers/pcmcia/socket_sysfs.c
+++ b/drivers/pcmcia/socket_sysfs.c
@@ -12,7 +12,6 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/major.h>
 #include <linux/errno.h>
@@ -25,6 +24,7 @@
 #include <linux/pm.h>
 #include <linux/pci.h>
 #include <linux/device.h>
+#include <linux/mutex.h>
 #include <asm/system.h>
 #include <asm/irq.h>
 
@@ -42,35 +42,28 @@
 
 static ssize_t pccard_show_type(struct class_device *dev, char *buf)
 {
-       int val;
        struct pcmcia_socket *s = to_socket(dev);
 
        if (!(s->state & SOCKET_PRESENT))
                return -ENODEV;
-       s->ops->get_status(s, &val);
-       if (val & SS_CARDBUS)
+       if (s->state & SOCKET_CARDBUS)
                return sprintf(buf, "32-bit\n");
-       if (val & SS_DETECT)
-               return sprintf(buf, "16-bit\n");
-       return sprintf(buf, "invalid\n");
+       return sprintf(buf, "16-bit\n");
 }
-static CLASS_DEVICE_ATTR(card_type, 0400, pccard_show_type, NULL);
+static CLASS_DEVICE_ATTR(card_type, 0444, pccard_show_type, NULL);
 
 static ssize_t pccard_show_voltage(struct class_device *dev, char *buf)
 {
-       int val;
        struct pcmcia_socket *s = to_socket(dev);
 
        if (!(s->state & SOCKET_PRESENT))
                return -ENODEV;
-       s->ops->get_status(s, &val);
-       if (val & SS_3VCARD)
-               return sprintf(buf, "3.3V\n");
-       if (val & SS_XVCARD)
-               return sprintf(buf, "X.XV\n");
-       return sprintf(buf, "5.0V\n");
+       if (s->socket.Vcc)
+               return sprintf(buf, "%d.%dV\n", s->socket.Vcc / 10,
+                              s->socket.Vcc % 10);
+       return sprintf(buf, "X.XV\n");
 }
-static CLASS_DEVICE_ATTR(card_voltage, 0400, pccard_show_voltage, NULL);
+static CLASS_DEVICE_ATTR(card_voltage, 0444, pccard_show_voltage, NULL);
 
 static ssize_t pccard_show_vpp(struct class_device *dev, char *buf)
 {
@@ -79,7 +72,7 @@ static ssize_t pccard_show_vpp(struct class_device *dev, char *buf)
                return -ENODEV;
        return sprintf(buf, "%d.%dV\n", s->socket.Vpp / 10, s->socket.Vpp % 10);
 }
-static CLASS_DEVICE_ATTR(card_vpp, 0400, pccard_show_vpp, NULL);
+static CLASS_DEVICE_ATTR(card_vpp, 0444, pccard_show_vpp, NULL);
 
 static ssize_t pccard_show_vcc(struct class_device *dev, char *buf)
 {
@@ -88,7 +81,7 @@ static ssize_t pccard_show_vcc(struct class_device *dev, char *buf)
                return -ENODEV;
        return sprintf(buf, "%d.%dV\n", s->socket.Vcc / 10, s->socket.Vcc % 10);
 }
-static CLASS_DEVICE_ATTR(card_vcc, 0400, pccard_show_vcc, NULL);
+static CLASS_DEVICE_ATTR(card_vcc, 0444, pccard_show_vcc, NULL);
 
 
 static ssize_t pccard_store_insert(struct class_device *dev, const char *buf, size_t count)
@@ -105,6 +98,30 @@ static ssize_t pccard_store_insert(struct class_device *dev, const char *buf, si
 }
 static CLASS_DEVICE_ATTR(card_insert, 0200, NULL, pccard_store_insert);
 
+
+static ssize_t pccard_show_card_pm_state(struct class_device *dev, char *buf)
+{
+       struct pcmcia_socket *s = to_socket(dev);
+       return sprintf(buf, "%s\n", s->state & SOCKET_SUSPEND ? "off" : "on");
+}
+
+static ssize_t pccard_store_card_pm_state(struct class_device *dev, const char *buf, size_t count)
+{
+       ssize_t ret = -EINVAL;
+       struct pcmcia_socket *s = to_socket(dev);
+
+       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);
+
+       return ret ? -ENODEV : count;
+}
+static CLASS_DEVICE_ATTR(card_pm_state, 0644, pccard_show_card_pm_state, pccard_store_card_pm_state);
+
 static ssize_t pccard_store_eject(struct class_device *dev, const char *buf, size_t count)
 {
        ssize_t ret;
@@ -166,7 +183,7 @@ static ssize_t pccard_store_resource(struct class_device *dev, const char *buf,
                s->resource_setup_done = 1;
        spin_unlock_irqrestore(&s->lock, flags);
 
-       down(&s->skt_sem);
+       mutex_lock(&s->skt_mutex);
        if ((s->callback) &&
            (s->state & SOCKET_PRESENT) &&
            !(s->state & SOCKET_CARDBUS)) {
@@ -175,7 +192,7 @@ static ssize_t pccard_store_resource(struct class_device *dev, const char *buf,
                        module_put(s->callback->owner);
                }
        }
-       up(&s->skt_sem);
+       mutex_unlock(&s->skt_mutex);
 
        return count;
 }
@@ -281,7 +298,7 @@ static ssize_t pccard_store_cis(struct kobject *kobj, char *buf, loff_t off, siz
 {
        struct pcmcia_socket *s = to_socket(container_of(kobj, struct class_device, kobj));
        cisdump_t *cis;
-       ssize_t ret = count;
+       int error;
 
        if (off)
                return -EINVAL;
@@ -292,33 +309,29 @@ static ssize_t pccard_store_cis(struct kobject *kobj, char *buf, loff_t off, siz
        if (!(s->state & SOCKET_PRESENT))
                return -ENODEV;
 
-       cis = kmalloc(sizeof(cisdump_t), GFP_KERNEL);
+       cis = kzalloc(sizeof(cisdump_t), GFP_KERNEL);
        if (!cis)
                return -ENOMEM;
-       memset(cis, 0, sizeof(cisdump_t));
 
        cis->Length = count + 1;
        memcpy(cis->Data, buf, count);
 
-       if (pcmcia_replace_cis(s, cis))
-               ret  = -EIO;
-
+       error = pcmcia_replace_cis(s, cis);
        kfree(cis);
+       if (error)
+               return -EIO;
 
-       if (!ret) {
-               down(&s->skt_sem);
-               if ((s->callback) && (s->state & SOCKET_PRESENT) &&
-                   !(s->state & SOCKET_CARDBUS)) {
-                       if (try_module_get(s->callback->owner)) {
-                               s->callback->requery(s);
-                               module_put(s->callback->owner);
-                       }
+       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);
+                       module_put(s->callback->owner);
                }
-               up(&s->skt_sem);
        }
+       mutex_unlock(&s->skt_mutex);
 
-
-       return (ret);
+       return count;
 }
 
 
@@ -328,6 +341,7 @@ static struct class_device_attribute *pccard_socket_attributes[] = {
        &class_device_attr_card_vpp,
        &class_device_attr_card_vcc,
        &class_device_attr_card_insert,
+       &class_device_attr_card_pm_state,
        &class_device_attr_card_eject,
        &class_device_attr_card_irq_mask,
        &class_device_attr_available_resources_setup_done,