Revert "driver core: Add support for linking devices during device addition"

[sfrench/cifs-2.6.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 73210745cc6b38d6f79feaf1aa63e485e62c82e7..ec598ede94553c4ba7cf00c55b1b20e323ae8fb6 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -78,17 +78,6 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *);
  *             -EPROBE_DEFER it will queue the device for deferred probing.
  * @uevent:    Called when a device is added, removed, or a few other things
  *             that generate uevents to add the environment variables.
- * @add_links: Called, perhaps multiple times per device, after a device is
- *             added to this bus.  The function is expected to create device
- *             links to all the suppliers of the input device that are
- *             available at the time this function is called.  As in, the
- *             function should NOT stop at the first failed device link if
- *             other unlinked supplier devices are present in the system.
- *
- *             Return 0 if device links have been successfully created to all
- *             the suppliers of this device.  Return an error if some of the
- *             suppliers are not yet available and this function needs to be
- *             reattempted in the future.
  * @probe:     Called when a new device or driver add to this bus, and callback
  *             the specific driver's probe to initial the matched device.
  * @remove:    Called when a device removed from this bus.
@@ -133,7 +122,6 @@ struct bus_type {
 
        int (*match)(struct device *dev, struct device_driver *drv);
        int (*uevent)(struct device *dev, struct kobj_uevent_env *env);
-       int (*add_links)(struct device *dev);
        int (*probe)(struct device *dev);
        int (*remove)(struct device *dev);
        void (*shutdown)(struct device *dev);
@@ -1143,13 +1131,11 @@ enum dl_dev_state {
  * struct dev_links_info - Device data related to device links.
  * @suppliers: List of links to supplier devices.
  * @consumers: List of links to consumer devices.
- * @needs_suppliers: Hook to global list of devices waiting for suppliers.
  * @status: Driver status information.
  */
 struct dev_links_info {
        struct list_head suppliers;
        struct list_head consumers;
-       struct list_head needs_suppliers;
        enum dl_dev_state status;
 };