From foo@baz Tue Apr 9 12:12:43 2002 Date: Mon, 5 Nov 2007 13:16:15 -0800 To: Greg KH From: Greg Kroah-Hartman Subject: 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 Cc: Cornelia Huck Signed-off-by: Greg Kroah-Hartman --- arch/s390/kernel/ipl.c | 10 +++++----- drivers/acpi/bus.c | 4 ++-- drivers/base/firmware.c | 8 ++++---- drivers/firmware/edd.c | 2 +- drivers/firmware/efivars.c | 2 +- drivers/parisc/pdc_stable.c | 4 ++-- include/linux/kobject.h | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -855,7 +855,7 @@ static int __init ipl_init(void) { int rc; - ipl_kset = kset_create_and_register("ipl", NULL, NULL, firmware_kset); + ipl_kset = kset_create_and_register("ipl", NULL, firmware_kobj, NULL); if (!ipl_kset) return -ENOMEM; switch (ipl_info.type) { @@ -974,7 +974,7 @@ static int __init reipl_init(void) { int rc; - reipl_kset = kset_create_and_register("reipl", NULL, NULL, firmware_kset); + reipl_kset = kset_create_and_register("reipl", NULL, firmware_kobj, NULL); if (!reipl_kset) return -ENOMEM; rc = sysfs_create_file(&reipl_kset->kobj, &reipl_type_attr.attr); @@ -1063,7 +1063,7 @@ static int __init dump_init(void) { int rc; - dump_kset = kset_create_and_register("dump", NULL, NULL, firmware_kset); + dump_kset = kset_create_and_register("dump", NULL, firmware_kobj, NULL); if (!dump_kset) return -ENOMEM; rc = sysfs_create_file(&dump_kset->kobj, &dump_type_attr); @@ -1086,8 +1086,8 @@ static int __init shutdown_actions_init( int rc; shutdown_actions_kset = kset_create_and_register("shutdown_actions", - NULL, NULL, - firmware_kset); + NULL, firmware_kobj, + NULL); if (!shutdown_actions_kset) return -ENOMEM; rc = sysfs_create_file(&shutdown_actions_kset->kobj, &on_panic_attr); --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -756,8 +756,8 @@ static int __init acpi_init(void) return -ENODEV; } - acpi_kset = kset_create_and_register("acpi", NULL, NULL, - firmware_kset); + acpi_kset = kset_create_and_register("acpi", NULL, firmware_kobj, + NULL); if (!acpi_kset) { printk(KERN_WARNING "%s: kset create error\n", __FUNCTION__); acpi_kset = NULL; --- a/drivers/base/firmware.c +++ b/drivers/base/firmware.c @@ -15,13 +15,13 @@ #include "base.h" -struct kset *firmware_kset; -EXPORT_SYMBOL_GPL(firmware_kset); +struct kobject *firmware_kobj; +EXPORT_SYMBOL_GPL(firmware_kobj); int __init firmware_init(void) { - firmware_kset = kset_create_and_register("firmware", NULL, NULL, NULL); - if (!firmware_kset) + firmware_kobj = kobject_create_and_register("firmware", NULL); + if (!firmware_kobj) return -ENOMEM; return 0; } --- a/drivers/firmware/edd.c +++ b/drivers/firmware/edd.c @@ -756,7 +756,7 @@ edd_init(void) return 1; } - edd_kset = kset_create_and_register("edd", NULL, NULL, firmware_kset); + edd_kset = kset_create_and_register("edd", NULL, firmware_kobj, NULL); if (!edd_kset) return -ENOMEM; --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c @@ -668,7 +668,7 @@ efivars_init(void) /* * For now we'll register the efi subsys within this driver */ - efi_kset = kset_create_and_register("efi", NULL, NULL, firmware_kset); + efi_kset = kset_create_and_register("efi", NULL, firmware_kobj, NULL); if (!efi_kset) { printk(KERN_ERR "efivars: Firmware registration failed.\n"); error = -ENOMEM; --- a/drivers/parisc/pdc_stable.c +++ b/drivers/parisc/pdc_stable.c @@ -1059,8 +1059,8 @@ pdc_stable_init(void) pdcs_osid = (u16)(result >> 16); /* For now we'll register the stable kset within this driver */ - stable_kset = kset_create_and_register("stable", NULL, NULL, - firmware_kset); + stable_kset = kset_create_and_register("stable", NULL, firmware_kobj, + NULL); if (!stable_kset) { rc = -ENOMEM; goto fail_firmreg; --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -205,8 +205,8 @@ extern struct kset *kernel_kset; extern struct kobject *hypervisor_kobj; /* The global /sys/power/ kset for people to chain off of */ extern struct kset *power_kset; -/* The global /sys/firmware/ kset for people to chain off of */ -extern struct kset *firmware_kset; +/* The global /sys/firmware/ kobject for people to chain off of */ +extern struct kobject *firmware_kobj; extern int __must_check subsystem_register(struct kset *); extern void subsystem_unregister(struct kset *);