aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firmware
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-11-02 19:19:59 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 23:40:23 -0500
commit9651d350ab2c1b9ef1875be2a9def1c375e6503f (patch)
tree68817ecd091188b932922944317ef5ac2db6091c /drivers/firmware
parent000f2a4d8cfc1e1cbc0aa98136015e7ae7719b46 (diff)
kset: convert edd to use kset_create
Dynamically create the kset instead of declaring it statically. Cc: Kay Sievers <kay.sievers@vrfy.org> Cc: Matt Domsch <Matt_Domsch@dell.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/edd.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index fc567fad3f7c..f07f37047cd1 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -631,7 +631,7 @@ static struct kobj_type edd_ktype = {
631 .default_attrs = def_attrs, 631 .default_attrs = def_attrs,
632}; 632};
633 633
634static decl_subsys(edd, NULL); 634static struct kset *edd_kset;
635 635
636 636
637/** 637/**
@@ -723,7 +723,7 @@ edd_device_register(struct edd_device *edev, int i)
723 edd_dev_set_info(edev, i); 723 edd_dev_set_info(edev, i);
724 kobject_set_name(&edev->kobj, "int13_dev%02x", 724 kobject_set_name(&edev->kobj, "int13_dev%02x",
725 0x80 + i); 725 0x80 + i);
726 edev->kobj.kset = &edd_subsys; 726 edev->kobj.kset = edd_kset;
727 edev->kobj.ktype = &edd_ktype; 727 edev->kobj.ktype = &edd_ktype;
728 error = kobject_register(&edev->kobj); 728 error = kobject_register(&edev->kobj);
729 if (!error) 729 if (!error)
@@ -756,9 +756,9 @@ edd_init(void)
756 return 1; 756 return 1;
757 } 757 }
758 758
759 rc = firmware_register(&edd_subsys); 759 edd_kset = kset_create_and_add("edd", NULL, &firmware_kset->kobj);
760 if (rc) 760 if (!edd_kset)
761 return rc; 761 return -ENOMEM;
762 762
763 for (i = 0; i < edd_num_devices() && !rc; i++) { 763 for (i = 0; i < edd_num_devices() && !rc; i++) {
764 edev = kzalloc(sizeof (*edev), GFP_KERNEL); 764 edev = kzalloc(sizeof (*edev), GFP_KERNEL);
@@ -774,7 +774,7 @@ edd_init(void)
774 } 774 }
775 775
776 if (rc) 776 if (rc)
777 firmware_unregister(&edd_subsys); 777 kset_unregister(edd_kset);
778 return rc; 778 return rc;
779} 779}
780 780
@@ -788,7 +788,7 @@ edd_exit(void)
788 if ((edev = edd_devices[i])) 788 if ((edev = edd_devices[i]))
789 edd_device_unregister(edev); 789 edd_device_unregister(edev);
790 } 790 }
791 firmware_unregister(&edd_subsys); 791 kset_unregister(edd_kset);
792} 792}
793 793
794late_initcall(edd_init); 794late_initcall(edd_init);