make kernel cross-compile

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

diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index b005602..a2bb465 100644 (file)
--- a/drivers/pcmcia/socket_sysfs.c
+++ b/drivers/pcmcia/socket_sysfs.c
@@ -22,7 +22,6 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
-#include <linux/pci.h>
 #include <linux/device.h>
 #include <linux/mutex.h>
 #include <asm/system.h>
@@ -40,7 +39,8 @@
 
 #define to_socket(_dev) container_of(_dev, struct pcmcia_socket, dev)
 
-static ssize_t pccard_show_type(struct class_device *dev, char *buf)
+static ssize_t pccard_show_type(struct device *dev, struct device_attribute *attr,
+                               char *buf)
 {
        struct pcmcia_socket *s = to_socket(dev);
 
@@ -50,9 +50,10 @@ static ssize_t pccard_show_type(struct class_device *dev, char *buf)
                return sprintf(buf, "32-bit\n");
        return sprintf(buf, "16-bit\n");
 }
-static CLASS_DEVICE_ATTR(card_type, 0444, pccard_show_type, NULL);
+static DEVICE_ATTR(card_type, 0444, pccard_show_type, NULL);
 
-static ssize_t pccard_show_voltage(struct class_device *dev, char *buf)
+static ssize_t pccard_show_voltage(struct device *dev, struct device_attribute *attr,
+                                  char *buf)
 {
        struct pcmcia_socket *s = to_socket(dev);
 
@@ -63,28 +64,31 @@ static ssize_t pccard_show_voltage(struct class_device *dev, char *buf)
                               s->socket.Vcc % 10);
        return sprintf(buf, "X.XV\n");
 }
-static CLASS_DEVICE_ATTR(card_voltage, 0444, pccard_show_voltage, NULL);
+static DEVICE_ATTR(card_voltage, 0444, pccard_show_voltage, NULL);
 
-static ssize_t pccard_show_vpp(struct class_device *dev, char *buf)
+static ssize_t pccard_show_vpp(struct device *dev, struct device_attribute *attr,
+                              char *buf)
 {
        struct pcmcia_socket *s = to_socket(dev);
        if (!(s->state & SOCKET_PRESENT))
                return -ENODEV;
        return sprintf(buf, "%d.%dV\n", s->socket.Vpp / 10, s->socket.Vpp % 10);
 }
-static CLASS_DEVICE_ATTR(card_vpp, 0444, pccard_show_vpp, NULL);
+static DEVICE_ATTR(card_vpp, 0444, pccard_show_vpp, NULL);
 
-static ssize_t pccard_show_vcc(struct class_device *dev, char *buf)
+static ssize_t pccard_show_vcc(struct device *dev, struct device_attribute *attr,
+                              char *buf)
 {
        struct pcmcia_socket *s = to_socket(dev);
        if (!(s->state & SOCKET_PRESENT))
                return -ENODEV;
        return sprintf(buf, "%d.%dV\n", s->socket.Vcc / 10, s->socket.Vcc % 10);
 }
-static CLASS_DEVICE_ATTR(card_vcc, 0444, pccard_show_vcc, NULL);
+static 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)
+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);
@@ -96,16 +100,20 @@ static ssize_t pccard_store_insert(struct class_device *dev, const char *buf, si
 
        return ret ? ret : count;
 }
-static CLASS_DEVICE_ATTR(card_insert, 0200, NULL, pccard_store_insert);
+static DEVICE_ATTR(card_insert, 0200, NULL, pccard_store_insert);
 
 
-static ssize_t pccard_show_card_pm_state(struct class_device *dev, char *buf)
+static ssize_t pccard_show_card_pm_state(struct device *dev,
+                                        struct device_attribute *attr,
+                                        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)
+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);
@@ -120,9 +128,11 @@ static ssize_t pccard_store_card_pm_state(struct class_device *dev, const char *
 
        return ret ? -ENODEV : count;
 }
-static CLASS_DEVICE_ATTR(card_pm_state, 0644, pccard_show_card_pm_state, pccard_store_card_pm_state);
+static 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)
+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);
@@ -134,16 +144,20 @@ static ssize_t pccard_store_eject(struct class_device *dev, const char *buf, siz
 
        return ret ? ret : count;
 }
-static CLASS_DEVICE_ATTR(card_eject, 0200, NULL, pccard_store_eject);
+static DEVICE_ATTR(card_eject, 0200, NULL, pccard_store_eject);
 
 
-static ssize_t pccard_show_irq_mask(struct class_device *dev, char *buf)
+static ssize_t pccard_show_irq_mask(struct device *dev,
+                                   struct device_attribute *attr,
+                                   char *buf)
 {
        struct pcmcia_socket *s = to_socket(dev);
        return sprintf(buf, "0x%04x\n", s->irq_mask);
 }
 
-static ssize_t pccard_store_irq_mask(struct class_device *dev, const char *buf, size_t count)
+static ssize_t pccard_store_irq_mask(struct device *dev,
+                                    struct device_attribute *attr,
+                                    const char *buf, size_t count)
 {
        ssize_t ret;
        struct pcmcia_socket *s = to_socket(dev);
@@ -161,16 +175,19 @@ static ssize_t pccard_store_irq_mask(struct class_device *dev, const char *buf,
 
        return ret ? ret : count;
 }
-static CLASS_DEVICE_ATTR(card_irq_mask, 0600, pccard_show_irq_mask, pccard_store_irq_mask);
+static DEVICE_ATTR(card_irq_mask, 0600, pccard_show_irq_mask, pccard_store_irq_mask);
 
 
-static ssize_t pccard_show_resource(struct class_device *dev, char *buf)
+static ssize_t pccard_show_resource(struct device *dev,
+                                   struct device_attribute *attr, char *buf)
 {
        struct pcmcia_socket *s = to_socket(dev);
        return sprintf(buf, "%s\n", s->resource_setup_done ? "yes" : "no");
 }
 
-static ssize_t pccard_store_resource(struct class_device *dev, const char *buf, size_t count)
+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);
@@ -196,7 +213,7 @@ static ssize_t pccard_store_resource(struct class_device *dev, const char *buf,
 
        return count;
 }
-static CLASS_DEVICE_ATTR(available_resources_setup_done, 0600, pccard_show_resource, pccard_store_resource);
+static DEVICE_ATTR(available_resources_setup_done, 0600, pccard_show_resource, pccard_store_resource);
 
 
 static ssize_t pccard_extract_cis(struct pcmcia_socket *s, char *buf, loff_t off, size_t count)
@@ -279,7 +296,7 @@ static ssize_t pccard_show_cis(struct kobject *kobj, char *buf, loff_t off, size
                if (off + count > size)
                        count = size - off;
 
-               s = to_socket(container_of(kobj, struct class_device, kobj));
+               s = to_socket(container_of(kobj, struct device, kobj));
 
                if (!(s->state & SOCKET_PRESENT))
                        return -ENODEV;
@@ -296,7 +313,7 @@ static ssize_t pccard_show_cis(struct kobject *kobj, char *buf, loff_t off, size
 
 static ssize_t pccard_store_cis(struct kobject *kobj, char *buf, loff_t off, size_t count)
 {
-       struct pcmcia_socket *s = to_socket(container_of(kobj, struct class_device, kobj));
+       struct pcmcia_socket *s = to_socket(container_of(kobj, struct device, kobj));
        cisdump_t *cis;
        int error;
 
@@ -335,16 +352,16 @@ static ssize_t pccard_store_cis(struct kobject *kobj, char *buf, loff_t off, siz
 }
 
 
-static struct class_device_attribute *pccard_socket_attributes[] = {
-       &class_device_attr_card_type,
-       &class_device_attr_card_voltage,
-       &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,
+static struct device_attribute *pccard_socket_attributes[] = {
+       &dev_attr_card_type,
+       &dev_attr_card_voltage,
+       &dev_attr_card_vpp,
+       &dev_attr_card_vcc,
+       &dev_attr_card_insert,
+       &dev_attr_card_pm_state,
+       &dev_attr_card_eject,
+       &dev_attr_card_irq_mask,
+       &dev_attr_available_resources_setup_done,
        NULL,
 };
 
@@ -355,35 +372,35 @@ static struct bin_attribute pccard_cis_attr = {
        .write = pccard_store_cis,
 };
 
-static int __devinit pccard_sysfs_add_socket(struct class_device *class_dev,
+static int __devinit pccard_sysfs_add_socket(struct device *dev,
                                             struct class_interface *class_intf)
 {
-       struct class_device_attribute **attr;
+       struct device_attribute **attr;
        int ret = 0;
 
        for (attr = pccard_socket_attributes; *attr; attr++) {
-               ret = class_device_create_file(class_dev, *attr);
+               ret = device_create_file(dev, *attr);
                if (ret)
                        break;
        }
        if (!ret)
-               ret = sysfs_create_bin_file(&class_dev->kobj, &pccard_cis_attr);
+               ret = sysfs_create_bin_file(&dev->kobj, &pccard_cis_attr);
 
        return ret;
 }
 
-static void __devexit pccard_sysfs_remove_socket(struct class_device *class_dev,
+static void __devexit pccard_sysfs_remove_socket(struct device *dev,
                                                 struct class_interface *class_intf)
 {
-       struct class_device_attribute **attr;
+       struct device_attribute **attr;
 
-       sysfs_remove_bin_file(&class_dev->kobj, &pccard_cis_attr);
+       sysfs_remove_bin_file(&dev->kobj, &pccard_cis_attr);
        for (attr = pccard_socket_attributes; *attr; attr++)
-               class_device_remove_file(class_dev, *attr);
+               device_remove_file(dev, *attr);
 }
 
 struct class_interface pccard_sysfs_interface = {
        .class = &pcmcia_socket_class,
-       .add = &pccard_sysfs_add_socket,
-       .remove = __devexit_p(&pccard_sysfs_remove_socket),
+       .add_dev = &pccard_sysfs_add_socket,
+       .remove_dev = __devexit_p(&pccard_sysfs_remove_socket),
 };