X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fbase%2Fbus.c;h=76656acd00d4e15c965c07a8a6ebcf1b4b511a42;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=2e954d07175a5c6d067531ac23d155c1a24d2d8d;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 2e954d071..76656acd0 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -8,6 +8,7 @@ * */ +#include #include #include #include @@ -129,7 +130,7 @@ static struct kobj_type ktype_bus = { }; -static decl_subsys(bus, &ktype_bus, NULL); +decl_subsys(bus, &ktype_bus, NULL); #ifdef CONFIG_HOTPLUG @@ -361,7 +362,8 @@ static void device_remove_attrs(struct bus_type * bus, struct device * dev) * @dev: device being added * * - Add the device to its bus's list of devices. - * - Create link to device's bus. + * - Try to attach to driver. + * - Create link to device's physical location. */ int bus_add_device(struct device * dev) { @@ -370,32 +372,17 @@ int bus_add_device(struct device * dev) if (bus) { pr_debug("bus %s: add device %s\n", bus->name, dev->bus_id); + device_attach(dev); + klist_add_tail(&dev->knode_bus, &bus->klist_devices); error = device_add_attrs(bus, dev); if (!error) { sysfs_create_link(&bus->devices.kobj, &dev->kobj, dev->bus_id); - sysfs_create_link(&dev->kobj, &dev->bus->subsys.kset.kobj, "subsystem"); sysfs_create_link(&dev->kobj, &dev->bus->subsys.kset.kobj, "bus"); } } return error; } -/** - * bus_attach_device - add device to bus - * @dev: device tried to attach to a driver - * - * - Try to attach to driver. - */ -void bus_attach_device(struct device * dev) -{ - struct bus_type * bus = dev->bus; - - if (bus) { - device_attach(dev); - klist_add_tail(&dev->knode_bus, &bus->klist_devices); - } -} - /** * bus_remove_device - remove device from bus * @dev: device to be removed @@ -408,7 +395,6 @@ void bus_attach_device(struct device * dev) void bus_remove_device(struct device * dev) { if (dev->bus) { - sysfs_remove_link(&dev->kobj, "subsystem"); sysfs_remove_link(&dev->kobj, "bus"); sysfs_remove_link(&dev->bus->devices.kobj, dev->bus_id); device_remove_attrs(dev->bus, dev); @@ -598,13 +584,12 @@ void put_bus(struct bus_type * bus) * * Note that kset_find_obj increments bus' reference count. */ -#if 0 + struct bus_type * find_bus(char * name) { struct kobject * k = kset_find_obj(&bus_subsys.kset, name); return k ? to_bus(k) : NULL; } -#endif /* 0 */ /** @@ -747,9 +732,14 @@ EXPORT_SYMBOL_GPL(bus_for_each_dev); EXPORT_SYMBOL_GPL(bus_find_device); EXPORT_SYMBOL_GPL(bus_for_each_drv); +EXPORT_SYMBOL_GPL(bus_add_device); +EXPORT_SYMBOL_GPL(bus_remove_device); EXPORT_SYMBOL_GPL(bus_register); EXPORT_SYMBOL_GPL(bus_unregister); EXPORT_SYMBOL_GPL(bus_rescan_devices); +EXPORT_SYMBOL_GPL(get_bus); +EXPORT_SYMBOL_GPL(put_bus); +EXPORT_SYMBOL_GPL(find_bus); EXPORT_SYMBOL_GPL(bus_create_file); EXPORT_SYMBOL_GPL(bus_remove_file);