Revert "driver core: Add edit_links() callback for drivers"

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

diff --git a/include/linux/device.h b/include/linux/device.h
index 90142ec9ce8417686cd1263ec4868bb6d49297e7..73210745cc6b38d6f79feaf1aa63e485e62c82e7 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -349,20 +349,6 @@ enum probe_type {
  * @probe_type:        Type of the probe (synchronous or asynchronous) to use.
  * @of_match_table: The open firmware table.
  * @acpi_match_table: The ACPI match table.
- * @edit_links:        Called to allow a matched driver to edit the device links the
- *             bus might have added incorrectly. This will be useful to handle
- *             cases where the bus incorrectly adds functional dependencies
- *             that aren't true or tries to create cyclic dependencies. But
- *             doesn't correctly handle functional dependencies that are
- *             missed by the bus as the supplier's sync_state might get to
- *             execute before the driver for a missing consumer is loaded and
- *             gets to edit the device links for the consumer.
- *
- *             This function might be called multiple times after a new device
- *             is added.  The function is expected to create all the device
- *             links for the new device and return 0 if it was completed
- *             successfully or return an error if it needs to be reattempted
- *             in the future.
  * @probe:     Called to query the existence of a specific device,
  *             whether this driver can work with it, and bind the driver
  *             to a specific device.
@@ -404,7 +390,6 @@ struct device_driver {
        const struct of_device_id       *of_match_table;
        const struct acpi_device_id     *acpi_match_table;
 
-       int (*edit_links)(struct device *dev);
        int (*probe) (struct device *dev);
        int (*remove) (struct device *dev);
        void (*shutdown) (struct device *dev);
@@ -1240,8 +1225,6 @@ struct dev_links_info {
  * @offline:   Set after successful invocation of bus type's .offline().
  * @of_node_reused: Set if the device-tree node is shared with an ancestor
  *              device.
- * @has_edit_links: This device has a driver than is capable of
- *                 editing the device links created by driver core.
  * @dma_coherent: this particular device is dma coherent, even if the
  *             architecture supports non-coherent devices.
  *
@@ -1338,7 +1321,6 @@ struct device {
        bool                    offline_disabled:1;
        bool                    offline:1;
        bool                    of_node_reused:1;
-       bool                    has_edit_links:1;
 #if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE) || \
     defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU) || \
     defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL)
@@ -1590,7 +1572,6 @@ extern int  __must_check device_attach(struct device *dev);
 extern int __must_check driver_attach(struct device_driver *drv);
 extern void device_initial_probe(struct device *dev);
 extern int __must_check device_reprobe(struct device *dev);
-extern int driver_edit_links(struct device *dev);
 
 extern bool device_is_bound(struct device *dev);
 
@@ -1682,7 +1663,6 @@ struct device_link *device_link_add(struct device *consumer,
                                    struct device *supplier, u32 flags);
 void device_link_del(struct device_link *link);
 void device_link_remove(void *consumer, struct device *supplier);
-void device_link_remove_from_wfs(struct device *consumer);
 
 #ifndef dev_fmt
 #define dev_fmt(fmt) fmt