Commit 2023c610 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

Driver core: add new device to bus's list before probing 



This patch (as1271) affects when new devices get linked into their
bus's list of devices.  Currently this happens after probing, and it
doesn't happen at all if probing fails.  Clearly this is wrong,
because at that point quite a few symbolic links have already been
created in sysfs.  We are committed to adding the device, so it should
be linked into the bus's list regardless.

In addition, this needs to happen before the uevent announcing the new
device gets issued.  Otherwise user programs might try to access the
device before it has been added to the bus.

To fix both these problems, the patch moves the call to
klist_add_tail() forward from bus_attach_device() to bus_add_device().
Since bus_attach_device() now does nothing but probe for drivers, it
has been renamed to bus_probe_device().  And lastly, the kerneldoc is
updated.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
CC: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 18240904

drivers/base/base.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ extern int system_bus_init(void); 
extern int cpu_dev_init(void);



extern int bus_add_device(struct device *dev);

extern void bus_attach_device(struct device *dev);

extern void bus_probe_device(struct device *dev);

extern void bus_remove_device(struct device *dev);



extern int bus_add_driver(struct device_driver *drv);

drivers/base/bus.c

+10 −13
Original line number Diff line number Diff line
@@ -459,8 +459,9 @@ static inline void remove_deprecated_bus_links(struct device *dev) { } 
 * bus_add_device - add device to bus

 * @dev: device being added

 *

 * - Add device's bus attributes.

 * - Create links to device's bus.

 * - Add the device to its bus's list of devices.

 * - Create link to device's bus.

 */

int bus_add_device(struct device *dev)

{
@@ -483,6 +484,7 @@ int bus_add_device(struct device *dev) 
		error = make_deprecated_bus_links(dev);

		if (error)

			goto out_deprecated;

		klist_add_tail(&dev->p->knode_bus, &bus->p->klist_devices);

	}

	return 0;
@@ -498,24 +500,19 @@ out_put: 
}



/**

 * bus_attach_device - add device to bus

 * @dev: device tried to attach to a driver

 * bus_probe_device - probe drivers for a new device

 * @dev: device to probe

 *

 * - Add device to bus's list of devices.

 * - Try to attach to driver.

 * - Automatically probe for a driver if the bus allows it.

 */

void bus_attach_device(struct device *dev)

void bus_probe_device(struct device *dev)

{

	struct bus_type *bus = dev->bus;

	int ret = 0;

	int ret;



	if (bus) {

		if (bus->p->drivers_autoprobe)

	if (bus && bus->p->drivers_autoprobe) {

		ret = device_attach(dev);

		WARN_ON(ret < 0);

		if (ret >= 0)

			klist_add_tail(&dev->p->knode_bus,

				       &bus->p->klist_devices);

	}

}

drivers/base/core.c

+1 −1
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ int device_add(struct device *dev) 
					     BUS_NOTIFY_ADD_DEVICE, dev);



	kobject_uevent(&dev->kobj, KOBJ_ADD);

	bus_attach_device(dev);

	bus_probe_device(dev);

	if (parent)

		klist_add_tail(&dev->p->knode_parent,

			       &parent->p->klist_children);

CRA Git | Maintained and supported by SUSTech CRA and CCSE