diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-11-02 03:41:16 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-25 05:40:33 +0100 |
| commit | 0fed80f7a63abd7168907267af69ee31f6bcf301 (patch) | |
| tree | 2380e2180aa01d883a5c2a2a0528c40f36d23d91 | |
| parent | driver core: remove owner field from struct bus_type (diff) | |
| download | linux-0fed80f7a63abd7168907267af69ee31f6bcf301.tar.xz linux-0fed80f7a63abd7168907267af69ee31f6bcf301.zip | |
driver core: add way to get to bus kset
This allows an easier way to get to the kset associated with a struct
bus_type (you have three to choose from...) This will make it easier to
move these fields to be dynamic in a future patch.
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/base/bus.c | 6 | ||||
| -rw-r--r-- | drivers/pci/hotplug/pci_hotplug_core.c | 5 | ||||
| -rw-r--r-- | include/linux/device.h | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 871607b7c876..8335a1079b0e 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -935,6 +935,12 @@ int bus_unregister_notifier(struct bus_type *bus, struct notifier_block *nb) } EXPORT_SYMBOL_GPL(bus_unregister_notifier); +struct kset *bus_get_kset(struct bus_type *bus) +{ + return &bus->subsys; +} +EXPORT_SYMBOL_GPL(bus_get_kset); + int __init buses_init(void) { bus_kset = kset_create_and_add("bus", &bus_uevent_ops, NULL); diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c index 0f05e6a68b3b..3606d5b52a70 100644 --- a/drivers/pci/hotplug/pci_hotplug_core.c +++ b/drivers/pci/hotplug/pci_hotplug_core.c @@ -699,9 +699,12 @@ int __must_check pci_hp_change_slot_info(struct hotplug_slot *slot, static int __init pci_hotplug_init (void) { int result; + struct kset *pci_bus_kset; + + pci_bus_kset = bus_get_kset(&pci_bus_type); pci_hotplug_slots_kset = kset_create_and_add("slots", NULL, - &pci_bus_type.subsys.kobj); + &pci_bus_kset->kobj); if (!pci_hotplug_slots_kset) { result = -ENOMEM; err("Register subsys error\n"); diff --git a/include/linux/device.h b/include/linux/device.h index 313e0b32bc09..3cc13c32314a 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -117,6 +117,8 @@ extern int bus_unregister_notifier(struct bus_type *bus, #define BUS_NOTIFY_UNBIND_DRIVER 0x00000004 /* driver about to be unbound */ +extern struct kset *bus_get_kset(struct bus_type *bus); + struct device_driver { const char * name; struct bus_type * bus; |