aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/device.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-07-12 15:24:03 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2019-07-12 15:24:03 -0400
commitf632a8170a6b667ee4e3f552087588f0fe13c4bb (patch)
tree9fbdd3505f1471364265727dea1bc9d034cbed8f /include/linux/device.h
parentef8f3d48afd6a17a0dae8c277c2f539c2f19fd16 (diff)
parentc33d442328f556460b79aba6058adb37bb555389 (diff)
Merge tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core and debugfs updates from Greg KH: "Here is the "big" driver core and debugfs changes for 5.3-rc1 It's a lot of different patches, all across the tree due to some api changes and lots of debugfs cleanups. Other than the debugfs cleanups, in this set of changes we have: - bus iteration function cleanups - scripts/get_abi.pl tool to display and parse Documentation/ABI entries in a simple way - cleanups to Documenatation/ABI/ entries to make them parse easier due to typos and other minor things - default_attrs use for some ktype users - driver model documentation file conversions to .rst - compressed firmware file loading - deferred probe fixes All of these have been in linux-next for a while, with a bunch of merge issues that Stephen has been patient with me for" * tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (102 commits) debugfs: make error message a bit more verbose orangefs: fix build warning from debugfs cleanup patch ubifs: fix build warning after debugfs cleanup patch driver: core: Allow subsystems to continue deferring probe drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT arch_topology: Remove error messages on out-of-memory conditions lib: notifier-error-inject: no need to check return value of debugfs_create functions swiotlb: no need to check return value of debugfs_create functions ceph: no need to check return value of debugfs_create functions sunrpc: no need to check return value of debugfs_create functions ubifs: no need to check return value of debugfs_create functions orangefs: no need to check return value of debugfs_create functions nfsd: no need to check return value of debugfs_create functions lib: 842: no need to check return value of debugfs_create functions debugfs: provide pr_fmt() macro debugfs: log errors when something goes wrong drivers: s390/cio: Fix compilation warning about const qualifiers drivers: Add generic helper to match by of_node driver_find_device: Unify the match function with class_find_device() bus_find_device: Unify the match callback with class_find_device ...
Diffstat (limited to 'include/linux/device.h')
-rw-r--r--include/linux/device.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index adfcabcba8a1..5eabfa0c4dee 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -164,11 +164,13 @@ void subsys_dev_iter_init(struct subsys_dev_iter *iter,
164struct device *subsys_dev_iter_next(struct subsys_dev_iter *iter); 164struct device *subsys_dev_iter_next(struct subsys_dev_iter *iter);
165void subsys_dev_iter_exit(struct subsys_dev_iter *iter); 165void subsys_dev_iter_exit(struct subsys_dev_iter *iter);
166 166
167int device_match_of_node(struct device *dev, const void *np);
168
167int bus_for_each_dev(struct bus_type *bus, struct device *start, void *data, 169int bus_for_each_dev(struct bus_type *bus, struct device *start, void *data,
168 int (*fn)(struct device *dev, void *data)); 170 int (*fn)(struct device *dev, void *data));
169struct device *bus_find_device(struct bus_type *bus, struct device *start, 171struct device *bus_find_device(struct bus_type *bus, struct device *start,
170 void *data, 172 const void *data,
171 int (*match)(struct device *dev, void *data)); 173 int (*match)(struct device *dev, const void *data));
172struct device *bus_find_device_by_name(struct bus_type *bus, 174struct device *bus_find_device_by_name(struct bus_type *bus,
173 struct device *start, 175 struct device *start,
174 const char *name); 176 const char *name);
@@ -337,11 +339,12 @@ extern int __must_check driver_for_each_device(struct device_driver *drv,
337 int (*fn)(struct device *dev, 339 int (*fn)(struct device *dev,
338 void *)); 340 void *));
339struct device *driver_find_device(struct device_driver *drv, 341struct device *driver_find_device(struct device_driver *drv,
340 struct device *start, void *data, 342 struct device *start, const void *data,
341 int (*match)(struct device *dev, void *data)); 343 int (*match)(struct device *dev, const void *data));
342 344
343void driver_deferred_probe_add(struct device *dev); 345void driver_deferred_probe_add(struct device *dev);
344int driver_deferred_probe_check_state(struct device *dev); 346int driver_deferred_probe_check_state(struct device *dev);
347int driver_deferred_probe_check_state_continue(struct device *dev);
345 348
346/** 349/**
347 * struct subsys_interface - interfaces to device functions 350 * struct subsys_interface - interfaces to device functions