[PATCH] pcmcia: always use device pointer to config_t

[powerpc.git] / drivers / pcmcia / socket_sysfs.c

diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index e074bc1..5ab1cde 100644 (file)
--- a/drivers/pcmcia/socket_sysfs.c
+++ b/drivers/pcmcia/socket_sysfs.c
@@ -98,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;
@@ -285,10 +309,9 @@ 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);
@@ -321,6 +344,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,