From 83ddbd32c4004ae363f003b1507ba7d908a37498 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 2 Nov 2007 15:25:00 -0700 Subject: [PATCH] --- yaml --- r: 75775 b: refs/heads/master c: 4443d07fcfab39c4d2d9d7711cff983f15b374fc h: refs/heads/master i: 75773: 68310f1fd7544bbc2d5df6b7cbcc40bc81740686 75771: 1321dabb49a2dad43af4574071ad89c984d67b08 75767: aeff252e8b5ca45401ac8026f6501c1c11275e6e 75759: a813a7405df628e53df58d2d00a7c3f38c033381 75743: df60b6e4f256ffda545850f76b7b5a18efdd92f2 75711: 0e421ea459fa135362fe6d314006161074fff745 75647: 23cc001aa0eb3aca4a09339898d88c1dfddb6fc0 75519: b8e1b9d14d6275e6a1db501b88abc908d192d415 75263: 37a838c64e712b77bf5c209dbda02f883d8d5b09 74751: 457e822d40f2dce559350c27c3fe8d73daa215fd 73727: 03c81e481aebeb7c37917aa61d2ce8bd59d4dfcc v: v3 --- [refs] | 2 +- trunk/drivers/parisc/pdc_stable.c | 38 +++++++++++++++++-------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index d3a4227cac11..b278b7a1761c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f548217860a7cf8a345d87792a07512450dfbff +refs/heads/master: 4443d07fcfab39c4d2d9d7711cff983f15b374fc diff --git a/trunk/drivers/parisc/pdc_stable.c b/trunk/drivers/parisc/pdc_stable.c index e1b9cbaf4456..444483405abf 100644 --- a/trunk/drivers/parisc/pdc_stable.c +++ b/trunk/drivers/parisc/pdc_stable.c @@ -960,8 +960,8 @@ static struct attribute_group pdcs_attr_group = { .attrs = pdcs_subsys_attrs, }; -static decl_subsys(paths, NULL); -static decl_subsys(stable, NULL); +static struct kset *stable_kset; +static struct kset *paths_kset; /** * pdcs_register_pathentries - Prepares path entries kobjects for sysfs usage. @@ -993,7 +993,7 @@ pdcs_register_pathentries(void) if ((err = kobject_set_name(&entry->kobj, "%s", entry->name))) return err; - entry->kobj.kset = &paths_subsys; + entry->kobj.kset = paths_kset; entry->kobj.ktype = &ktype_pdcspath; if ((err = kobject_register(&entry->kobj))) return err; @@ -1058,19 +1058,24 @@ pdc_stable_init(void) /* the actual result is 16 bits away */ pdcs_osid = (u16)(result >> 16); - /* For now we'll register the stable subsys within this driver */ - if ((rc = firmware_register(&stable_subsys))) + /* For now we'll register the stable kset within this driver */ + stable_kset = kset_create_and_add("stable", NULL, &firmware_kset->kobj); + if (!stable_kset) { + rc = -ENOMEM; goto fail_firmreg; + } /* Don't forget the root entries */ - error = sysfs_create_group(&stable_subsys.kobj, pdcs_attr_group); + error = sysfs_create_group(&stable_kset->kobj, pdcs_attr_group); - /* register the paths subsys as a subsystem of stable subsys */ - paths_subsys.kobj.kset = &stable_subsys; - if ((rc = subsystem_register(&paths_subsys))) - goto fail_subsysreg; + /* register the paths kset as a child of the stable kset */ + paths_kset = kset_create_and_add("paths", NULL, &stable_kset->kobj); + if (!paths_kset) { + rc = -ENOMEM; + goto fail_ksetreg; + } - /* now we create all "files" for the paths subsys */ + /* now we create all "files" for the paths kset */ if ((rc = pdcs_register_pathentries())) goto fail_pdcsreg; @@ -1078,10 +1083,10 @@ pdc_stable_init(void) fail_pdcsreg: pdcs_unregister_pathentries(); - subsystem_unregister(&paths_subsys); + kset_unregister(paths_kset); -fail_subsysreg: - firmware_unregister(&stable_subsys); +fail_ksetreg: + kset_unregister(stable_kset); fail_firmreg: printk(KERN_INFO PDCS_PREFIX " bailing out\n"); @@ -1092,9 +1097,8 @@ static void __exit pdc_stable_exit(void) { pdcs_unregister_pathentries(); - subsystem_unregister(&paths_subsys); - - firmware_unregister(&stable_subsys); + kset_unregister(paths_kset); + kset_unregister(stable_kset); }