From e48627f0c21989451aea3ef3c7d65a44c1e7b1a4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 7 Nov 2007 13:56:19 -0800 Subject: [PATCH] --- yaml --- r: 75789 b: refs/heads/master c: c829a5b49858a83cc7bb5e1e730796575f5bb261 h: refs/heads/master i: 75787: 28260ac1e6146cc80cf7c4bcb4bb74c67516dd77 v: v3 --- [refs] | 2 +- trunk/drivers/parisc/pdc_stable.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 4afa1e0c1690..35cfe37f786e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc87d2fe7a1190f1c257af8a91fc490b1ee35954 +refs/heads/master: c829a5b49858a83cc7bb5e1e730796575f5bb261 diff --git a/trunk/drivers/parisc/pdc_stable.c b/trunk/drivers/parisc/pdc_stable.c index ef1a353e5540..880b10b8a311 100644 --- a/trunk/drivers/parisc/pdc_stable.c +++ b/trunk/drivers/parisc/pdc_stable.c @@ -960,7 +960,7 @@ static struct attribute_group pdcs_attr_group = { .attrs = pdcs_subsys_attrs, }; -static struct kset *stable_kset; +static struct kobject *stable_kobj; static struct kset *paths_kset; /** @@ -1058,18 +1058,18 @@ pdc_stable_init(void) /* the actual result is 16 bits away */ pdcs_osid = (u16)(result >> 16); - /* For now we'll register the stable kset within this driver */ - stable_kset = kset_create_and_add("stable", NULL, firmware_kobj); - if (!stable_kset) { + /* For now we'll register the directory at /sys/firmware/stable */ + stable_kobj = kobject_create_and_add("stable", firmware_kobj); + if (!stable_kobj) { rc = -ENOMEM; goto fail_firmreg; } /* Don't forget the root entries */ - error = sysfs_create_group(&stable_kset->kobj, pdcs_attr_group); + error = sysfs_create_group(stable_kobj, pdcs_attr_group); /* register the paths kset as a child of the stable kset */ - paths_kset = kset_create_and_add("paths", NULL, &stable_kset->kobj); + paths_kset = kset_create_and_add("paths", NULL, stable_kobj); if (!paths_kset) { rc = -ENOMEM; goto fail_ksetreg; @@ -1086,7 +1086,7 @@ pdc_stable_init(void) kset_unregister(paths_kset); fail_ksetreg: - kset_unregister(stable_kset); + kobject_unregister(stable_kobj); fail_firmreg: printk(KERN_INFO PDCS_PREFIX " bailing out\n"); @@ -1098,7 +1098,7 @@ pdc_stable_exit(void) { pdcs_unregister_pathentries(); kset_unregister(paths_kset); - kset_unregister(stable_kset); + kobject_unregister(stable_kobj); }