mtd: fix Orion NAND driver compilation with ARM OABI

[safe/jmp/linux-2.6] / drivers / firmware / edd.c

diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index 6942e06..110e24e 100644 (file)
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -11,7 +11,7 @@
  *
  * This code takes information provided by BIOS EDD calls
  * fn41 - Check Extensions Present and
- * fn48 - Get Device Parametes with EDD extensions
+ * fn48 - Get Device Parameters with EDD extensions
  * made in setup.S, copied to safe structures in setup.c,
  * and presents it in sysfs.
  *
@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, struct attribute *attr, char *buf)
        return ret;
 }
 
-static struct sysfs_ops edd_attr_ops = {
+static const struct sysfs_ops edd_attr_ops = {
        .show = edd_attr_show,
 };
 
@@ -631,7 +631,7 @@ static struct kobj_type edd_ktype = {
        .default_attrs  = def_attrs,
 };
 
-static decl_subsys(edd, &edd_ktype, NULL);
+static struct kset *edd_kset;
 
 
 /**
@@ -693,7 +693,7 @@ edd_create_symlink_to_pcidev(struct edd_device *edev)
 static inline void
 edd_device_unregister(struct edd_device *edev)
 {
-       kobject_unregister(&edev->kobj);
+       kobject_put(&edev->kobj);
 }
 
 static void edd_populate_dir(struct edd_device * edev)
@@ -721,12 +721,13 @@ edd_device_register(struct edd_device *edev, int i)
        if (!edev)
                return 1;
        edd_dev_set_info(edev, i);
-       kobject_set_name(&edev->kobj, "int13_dev%02x",
-                        0x80 + i);
-       kobj_set_kset_s(edev,edd_subsys);
-       error = kobject_register(&edev->kobj);
-       if (!error)
+       edev->kobj.kset = edd_kset;
+       error = kobject_init_and_add(&edev->kobj, &edd_ktype, NULL,
+                                    "int13_dev%02x", 0x80 + i);
+       if (!error) {
                edd_populate_dir(edev);
+               kobject_uevent(&edev->kobj, KOBJ_ADD);
+       }
        return error;
 }
 
@@ -752,12 +753,12 @@ edd_init(void)
 
        if (!edd_num_devices()) {
                printk(KERN_INFO "EDD information not available.\n");
-               return 1;
+               return -ENODEV;
        }
 
-       rc = firmware_register(&edd_subsys);
-       if (rc)
-               return rc;
+       edd_kset = kset_create_and_add("edd", NULL, firmware_kobj);
+       if (!edd_kset)
+               return -ENOMEM;
 
        for (i = 0; i < edd_num_devices() && !rc; i++) {
                edev = kzalloc(sizeof (*edev), GFP_KERNEL);
@@ -773,7 +774,7 @@ edd_init(void)
        }
 
        if (rc)
-               firmware_unregister(&edd_subsys);
+               kset_unregister(edd_kset);
        return rc;
 }
 
@@ -787,7 +788,7 @@ edd_exit(void)
                if ((edev = edd_devices[i]))
                        edd_device_unregister(edev);
        }
-       firmware_unregister(&edd_subsys);
+       kset_unregister(edd_kset);
 }
 
 late_initcall(edd_init);