diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-11-05 16:16:15 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-24 23:40:23 -0500 |
commit | f62ed9e33b3ccff54d66b08f82d11940bb9e269b (patch) | |
tree | 730e79fe5e1c38a0a277b075405d6671b8e450fe /arch/s390 | |
parent | 15f2f9b3a9db65aaf908fe7ee17bbe262ae3550f (diff) |
firmware: change firmware_kset to firmware_kobj
There is no firmware "subsystem" it's just a directory in /sys that
other portions of the kernel want to hook into. So make it a kobject
not a kset to help alivate anyone who tries to do some odd kset-like
things with this.
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/kernel/ipl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c index c8179fc30baa..b97694fa62ec 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c | |||
@@ -855,7 +855,7 @@ static int __init ipl_init(void) | |||
855 | { | 855 | { |
856 | int rc; | 856 | int rc; |
857 | 857 | ||
858 | ipl_kset = kset_create_and_add("ipl", NULL, &firmware_kset->kobj); | 858 | ipl_kset = kset_create_and_add("ipl", NULL, firmware_kobj); |
859 | if (!ipl_kset) | 859 | if (!ipl_kset) |
860 | return -ENOMEM; | 860 | return -ENOMEM; |
861 | switch (ipl_info.type) { | 861 | switch (ipl_info.type) { |
@@ -974,7 +974,7 @@ static int __init reipl_init(void) | |||
974 | { | 974 | { |
975 | int rc; | 975 | int rc; |
976 | 976 | ||
977 | reipl_kset = kset_create_and_add("reipl", NULL, &firmware_kset->kobj); | 977 | reipl_kset = kset_create_and_add("reipl", NULL, firmware_kobj); |
978 | if (!reipl_kset) | 978 | if (!reipl_kset) |
979 | return -ENOMEM; | 979 | return -ENOMEM; |
980 | rc = sysfs_create_file(&reipl_kset->kobj, &reipl_type_attr.attr); | 980 | rc = sysfs_create_file(&reipl_kset->kobj, &reipl_type_attr.attr); |
@@ -1063,7 +1063,7 @@ static int __init dump_init(void) | |||
1063 | { | 1063 | { |
1064 | int rc; | 1064 | int rc; |
1065 | 1065 | ||
1066 | dump_kset = kset_create_and_add("dump", NULL, &firmware_kset->kobj); | 1066 | dump_kset = kset_create_and_add("dump", NULL, firmware_kobj); |
1067 | if (!dump_kset) | 1067 | if (!dump_kset) |
1068 | return -ENOMEM; | 1068 | return -ENOMEM; |
1069 | rc = sysfs_create_file(&dump_kset->kobj, &dump_type_attr); | 1069 | rc = sysfs_create_file(&dump_kset->kobj, &dump_type_attr); |
@@ -1086,7 +1086,7 @@ static int __init shutdown_actions_init(void) | |||
1086 | int rc; | 1086 | int rc; |
1087 | 1087 | ||
1088 | shutdown_actions_kset = kset_create_and_add("shutdown_actions", NULL, | 1088 | shutdown_actions_kset = kset_create_and_add("shutdown_actions", NULL, |
1089 | &firmware_kset->kobj); | 1089 | firmware_kobj); |
1090 | if (!shutdown_actions_kset) | 1090 | if (!shutdown_actions_kset) |
1091 | return -ENOMEM; | 1091 | return -ENOMEM; |
1092 | rc = sysfs_create_file(&shutdown_actions_kset->kobj, &on_panic_attr); | 1092 | rc = sysfs_create_file(&shutdown_actions_kset->kobj, &on_panic_attr); |