Merge tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index adfcabcba8a1e913b0160b27d6239846e78ac4d7..5eabfa0c4dee65437e733e29c7031c91fbde4752 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -164,11 +164,13 @@ void subsys_dev_iter_init(struct subsys_dev_iter *iter,
 struct device *subsys_dev_iter_next(struct subsys_dev_iter *iter);
 void subsys_dev_iter_exit(struct subsys_dev_iter *iter);
 
+int device_match_of_node(struct device *dev, const void *np);
+
 int bus_for_each_dev(struct bus_type *bus, struct device *start, void *data,
                     int (*fn)(struct device *dev, void *data));
 struct device *bus_find_device(struct bus_type *bus, struct device *start,
-                              void *data,
-                              int (*match)(struct device *dev, void *data));
+                              const void *data,
+                              int (*match)(struct device *dev, const void *data));
 struct device *bus_find_device_by_name(struct bus_type *bus,
                                       struct device *start,
                                       const char *name);
@@ -337,11 +339,12 @@ extern int __must_check driver_for_each_device(struct device_driver *drv,
                                               int (*fn)(struct device *dev,
                                                         void *));
 struct device *driver_find_device(struct device_driver *drv,
-                                 struct device *start, void *data,
-                                 int (*match)(struct device *dev, void *data));
+                                 struct device *start, const void *data,
+                                 int (*match)(struct device *dev, const void *data));
 
 void driver_deferred_probe_add(struct device *dev);
 int driver_deferred_probe_check_state(struct device *dev);
+int driver_deferred_probe_check_state_continue(struct device *dev);
 
 /**
  * struct subsys_interface - interfaces to device functions