Skip to content

Commit

Permalink
kobject: convert parisc/pdc_stable to use kobject_create
Browse files Browse the repository at this point in the history
Using a kset for this simple directory is an overkill.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Thibaut VARENE <varenet@parisc-linux.org>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Grant Grundler <grundler@parisc-linux.org>
Cc: Kyle McMartin <kyle@parisc-linux.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed Jan 25, 2008
1 parent bc87d2f commit c829a5b
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/parisc/pdc_stable.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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;
Expand All @@ -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");
Expand All @@ -1098,7 +1098,7 @@ pdc_stable_exit(void)
{
pdcs_unregister_pathentries();
kset_unregister(paths_kset);
kset_unregister(stable_kset);
kobject_unregister(stable_kobj);
}


Expand Down

0 comments on commit c829a5b

Please sign in to comment.