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

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

kset: convert pci hotplug to use kset_create_and_add 



This also renames pci_hotplug_slots_subsys to pcis_hotplug_slots_kset
catch all current users with a build error instead of a build warning
which can easily be missed.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d405936b

drivers/pci/hotplug/acpiphp_ibm.c

+2 −2
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static int __init ibm_acpiphp_init(void) 
	int retval = 0;

	acpi_status status;

	struct acpi_device *device;

	struct kobject *sysdir = &pci_hotplug_slots_subsys.kobj;

	struct kobject *sysdir = &pci_hotplug_slots_kset->kobj;



	dbg("%s\n", __FUNCTION__);
@@ -476,7 +476,7 @@ static int __init ibm_acpiphp_init(void) 
static void __exit ibm_acpiphp_exit(void)

{

	acpi_status status;

	struct kobject *sysdir = &pci_hotplug_slots_subsys.kobj;

	struct kobject *sysdir = &pci_hotplug_slots_kset->kobj;



	dbg("%s\n", __FUNCTION__);

drivers/pci/hotplug/pci_hotplug_core.c

+11 −12
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static int debug; 


static LIST_HEAD(pci_hotplug_slot_list);



struct kset pci_hotplug_slots_subsys;

struct kset *pci_hotplug_slots_kset;



static ssize_t hotplug_slot_attr_show(struct kobject *kobj,

		struct attribute *attr, char *buf)
@@ -96,8 +96,6 @@ static struct kobj_type hotplug_slot_ktype = { 
	.release = &hotplug_slot_release,

};



decl_subsys_name(pci_hotplug_slots, slots, NULL);



/* these strings match up with the values in pci_bus_speed */

static char *pci_bus_speed_strings[] = {

	"33 MHz PCI",		/* 0x00 */
@@ -633,7 +631,7 @@ int pci_hp_register (struct hotplug_slot *slot) 
	}



	kobject_set_name(&slot->kobj, "%s", slot->name);

	slot->kobj.kset = &pci_hotplug_slots_subsys;

	slot->kobj.kset = pci_hotplug_slots_kset;

	slot->kobj.ktype = &hotplug_slot_ktype;



	/* this can fail if we have already registered a slot with the same name */
@@ -702,10 +700,11 @@ static int __init pci_hotplug_init (void) 
{

	int result;



	pci_hotplug_slots_subsys.kobj.kset = &pci_bus_type.subsys;

	result = subsystem_register(&pci_hotplug_slots_subsys);

	if (result) {

		err("Register subsys with error %d\n", result);

	pci_hotplug_slots_kset = kset_create_and_add("slots", NULL,

						     &pci_bus_type.subsys.kobj);

	if (!pci_hotplug_slots_kset) {

		result = -ENOMEM;

		err("Register subsys error\n");

		goto exit;

	}

	result = cpci_hotplug_init(debug);
@@ -718,7 +717,7 @@ static int __init pci_hotplug_init (void) 
	goto exit;



err_subsys:

	subsystem_unregister(&pci_hotplug_slots_subsys);

	kset_unregister(pci_hotplug_slots_kset);

exit:

	return result;

}
@@ -726,7 +725,7 @@ static int __init pci_hotplug_init (void) 
static void __exit pci_hotplug_exit (void)

{

	cpci_hotplug_exit();

	subsystem_unregister(&pci_hotplug_slots_subsys);

	kset_unregister(pci_hotplug_slots_kset);

}



module_init(pci_hotplug_init);
@@ -738,7 +737,7 @@ MODULE_LICENSE("GPL"); 
module_param(debug, bool, 0644);

MODULE_PARM_DESC(debug, "Debugging mode enabled or not");



EXPORT_SYMBOL_GPL(pci_hotplug_slots_subsys);

EXPORT_SYMBOL_GPL(pci_hotplug_slots_kset);

EXPORT_SYMBOL_GPL(pci_hp_register);

EXPORT_SYMBOL_GPL(pci_hp_deregister);

EXPORT_SYMBOL_GPL(pci_hp_change_slot_info);

drivers/pci/hotplug/rpadlpar_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ struct kobj_type ktype_dlpar_io = { 


struct kset dlpar_io_kset = {

	.kobj = {.ktype = &ktype_dlpar_io,

		 .parent = &pci_hotplug_slots_subsys.kobj},

		 .parent = &pci_hotplug_slots_kset->kobj},

};



int dlpar_sysfs_init(void)

include/linux/pci_hotplug.h

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ extern int pci_hp_register (struct hotplug_slot *slot); 
extern int pci_hp_deregister		(struct hotplug_slot *slot);

extern int __must_check pci_hp_change_slot_info	(struct hotplug_slot *slot,

						 struct hotplug_slot_info *info);

extern struct kset pci_hotplug_slots_subsys;

extern struct kset *pci_hotplug_slots_kset;



/* PCI Setting Record (Type 0) */

struct hpp_type0 {