Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f62ed9e3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 15f2f9b3

arch/s390/kernel/ipl.c

+4 −4
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ static int __init ipl_init(void) 
{

	int rc;



	ipl_kset = kset_create_and_add("ipl", NULL, &firmware_kset->kobj);

	ipl_kset = kset_create_and_add("ipl", NULL, firmware_kobj);

	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_add("reipl", NULL, &firmware_kset->kobj);

	reipl_kset = kset_create_and_add("reipl", NULL, firmware_kobj);

	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_add("dump", NULL, &firmware_kset->kobj);

	dump_kset = kset_create_and_add("dump", NULL, firmware_kobj);

	if (!dump_kset)

		return -ENOMEM;

	rc = sysfs_create_file(&dump_kset->kobj, &dump_type_attr);
@@ -1086,7 +1086,7 @@ static int __init shutdown_actions_init(void) 
	int rc;



	shutdown_actions_kset = kset_create_and_add("shutdown_actions", NULL,

						    &firmware_kset->kobj);

						    firmware_kobj);

	if (!shutdown_actions_kset)

		return -ENOMEM;

	rc = sysfs_create_file(&shutdown_actions_kset->kobj, &on_panic_attr);

drivers/acpi/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -755,7 +755,7 @@ static int __init acpi_init(void) 
		return -ENODEV;

	}



	acpi_kobj = kobject_create_and_add("acpi", &firmware_kset->kobj);

	acpi_kobj = kobject_create_and_add("acpi", firmware_kobj);

	if (!acpi_kobj) {

		printk(KERN_WARNING "%s: kset create error\n", __FUNCTION__);

		acpi_kobj = NULL;

drivers/base/firmware.c

+4 −4
Original line number Diff line number Diff line
@@ -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_add("firmware", NULL, NULL);

	if (!firmware_kset)

	firmware_kobj = kobject_create_and_add("firmware", NULL);

	if (!firmware_kobj)

		return -ENOMEM;

	return 0;

}

drivers/firmware/edd.c

+1 −1
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ edd_init(void) 
		return 1;

	}



	edd_kset = kset_create_and_add("edd", NULL, &firmware_kset->kobj);

	edd_kset = kset_create_and_add("edd", NULL, firmware_kobj);

	if (!edd_kset)

		return -ENOMEM;

drivers/firmware/efivars.c

+1 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ efivars_init(void) 
	/*

	 * For now we'll register the efi subsys within this driver

	 */

	efi_kset = kset_create_and_add("efi", NULL, &firmware_kset->kobj);

	efi_kset = kset_create_and_add("efi", NULL, firmware_kobj);

	if (!efi_kset) {

		printk(KERN_ERR "efivars: Firmware registration failed.\n");

		error = -ENOMEM;