diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 14:02:49 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 14:02:49 +1000 |
| commit | f3c284343a174fc50f5401dffa718aa3e257da1f (patch) | |
| tree | f787d2a6d49b059bc1fb9cfb7391aed7302f47b1 /include | |
| parent | c2fefa46d1a046cac65a28c3a4ce71d7f0973dbf (diff) | |
| parent | 38a523a2946d3a0961d141d477a1ee2b1f3bdbb1 (diff) | |
| download | linux-next-f3c284343a174fc50f5401dffa718aa3e257da1f.tar.gz linux-next-f3c284343a174fc50f5401dffa718aa3e257da1f.zip | |
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device.h | 2 | ||||
| -rw-r--r-- | include/linux/device/driver.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index dc941997795c..424b55df0272 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -905,6 +905,8 @@ struct device *device_find_child(struct device *dev, void *data, int (*match)(struct device *dev, void *data)); struct device *device_find_child_by_name(struct device *parent, const char *name); +struct device *device_find_any_child(struct device *parent); + int device_rename(struct device *dev, const char *new_name); int device_move(struct device *dev, struct device *new_parent, enum dpm_order dpm_order); diff --git a/include/linux/device/driver.h b/include/linux/device/driver.h index 700453017e1c..7acaabde5396 100644 --- a/include/linux/device/driver.h +++ b/include/linux/device/driver.h @@ -129,6 +129,7 @@ extern struct device_driver *driver_find(const char *name, struct bus_type *bus); extern int driver_probe_done(void); extern void wait_for_device_probe(void); +void __init wait_for_init_devices_probe(void); /* sysfs interface for exporting driver attributes */ @@ -241,7 +242,6 @@ driver_find_device_by_acpi_dev(struct device_driver *drv, const void *adev) extern int driver_deferred_probe_timeout; void driver_deferred_probe_add(struct device *dev); -int driver_deferred_probe_check_state(struct device *dev); void driver_init(void); /** |