firmware: change firmware_kset to firmware_kobj

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

diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index 6942e065e6095d2fe55188843f0f7d4dce36dd2a..ddcc95793068308f5f3dbdbfef7749d5aa2371ac 100644 (file)
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -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;
 
 
 /**
@@ -723,7 +723,8 @@ edd_device_register(struct edd_device *edev, int i)
        edd_dev_set_info(edev, i);
        kobject_set_name(&edev->kobj, "int13_dev%02x",
                         0x80 + i);
-       kobj_set_kset_s(edev,edd_subsys);
+       edev->kobj.kset = edd_kset;
+       edev->kobj.ktype = &edd_ktype;
        error = kobject_register(&edev->kobj);
        if (!error)
                edd_populate_dir(edev);
@@ -755,9 +756,9 @@ edd_init(void)
                return 1;
        }
 
-       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);