aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
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
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')
-rw-r--r--include/linux/backing-dev-defs.h1
-rw-r--r--include/linux/ceph/debugfs.h4
-rw-r--r--include/linux/cpuhotplug.h1
-rw-r--r--include/linux/debugfs.h12
-rw-r--r--include/linux/device.h11
-rw-r--r--include/linux/mfd/syscon.h6
6 files changed, 15 insertions, 20 deletions
diff --git a/include/linux/backing-dev-defs.h b/include/linux/backing-dev-defs.h
index 07e02d6df5ad..6a1a8a314d85 100644
--- a/include/linux/backing-dev-defs.h
+++ b/include/linux/backing-dev-defs.h
@@ -203,7 +203,6 @@ struct backing_dev_info {
203 203
204#ifdef CONFIG_DEBUG_FS 204#ifdef CONFIG_DEBUG_FS
205 struct dentry *debug_dir; 205 struct dentry *debug_dir;
206 struct dentry *debug_stats;
207#endif 206#endif
208}; 207};
209 208
diff --git a/include/linux/ceph/debugfs.h b/include/linux/ceph/debugfs.h
index fa5f9b7f5dbb..cf5e840eec71 100644
--- a/include/linux/ceph/debugfs.h
+++ b/include/linux/ceph/debugfs.h
@@ -19,9 +19,9 @@ static const struct file_operations name##_fops = { \
19}; 19};
20 20
21/* debugfs.c */ 21/* debugfs.c */
22extern int ceph_debugfs_init(void); 22extern void ceph_debugfs_init(void);
23extern void ceph_debugfs_cleanup(void); 23extern void ceph_debugfs_cleanup(void);
24extern int ceph_debugfs_client_init(struct ceph_client *client); 24extern void ceph_debugfs_client_init(struct ceph_client *client);
25extern void ceph_debugfs_client_cleanup(struct ceph_client *client); 25extern void ceph_debugfs_client_cleanup(struct ceph_client *client);
26 26
27#endif 27#endif
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
index 87c211adf49e..068793a619ca 100644
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@ -176,6 +176,7 @@ enum cpuhp_state {
176 CPUHP_AP_WATCHDOG_ONLINE, 176 CPUHP_AP_WATCHDOG_ONLINE,
177 CPUHP_AP_WORKQUEUE_ONLINE, 177 CPUHP_AP_WORKQUEUE_ONLINE,
178 CPUHP_AP_RCUTREE_ONLINE, 178 CPUHP_AP_RCUTREE_ONLINE,
179 CPUHP_AP_BASE_CACHEINFO_ONLINE,
179 CPUHP_AP_ONLINE_DYN, 180 CPUHP_AP_ONLINE_DYN,
180 CPUHP_AP_ONLINE_DYN_END = CPUHP_AP_ONLINE_DYN + 30, 181 CPUHP_AP_ONLINE_DYN_END = CPUHP_AP_ONLINE_DYN + 30,
181 CPUHP_AP_X86_HPET_ONLINE, 182 CPUHP_AP_X86_HPET_ONLINE,
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h
index 3b0ba54cc4d5..58424eb3b329 100644
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
@@ -133,9 +133,8 @@ struct dentry *debugfs_create_regset32(const char *name, umode_t mode,
133void debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs, 133void debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs,
134 int nregs, void __iomem *base, char *prefix); 134 int nregs, void __iomem *base, char *prefix);
135 135
136struct dentry *debugfs_create_u32_array(const char *name, umode_t mode, 136void debugfs_create_u32_array(const char *name, umode_t mode,
137 struct dentry *parent, 137 struct dentry *parent, u32 *array, u32 elements);
138 u32 *array, u32 elements);
139 138
140struct dentry *debugfs_create_devm_seqfile(struct device *dev, const char *name, 139struct dentry *debugfs_create_devm_seqfile(struct device *dev, const char *name,
141 struct dentry *parent, 140 struct dentry *parent,
@@ -353,11 +352,10 @@ static inline bool debugfs_initialized(void)
353 return false; 352 return false;
354} 353}
355 354
356static inline struct dentry *debugfs_create_u32_array(const char *name, umode_t mode, 355static inline void debugfs_create_u32_array(const char *name, umode_t mode,
357 struct dentry *parent, 356 struct dentry *parent, u32 *array,
358 u32 *array, u32 elements) 357 u32 elements)
359{ 358{
360 return ERR_PTR(-ENODEV);
361} 359}
362 360
363static inline struct dentry *debugfs_create_devm_seqfile(struct device *dev, 361static inline struct dentry *debugfs_create_devm_seqfile(struct device *dev,
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
diff --git a/include/linux/mfd/syscon.h b/include/linux/mfd/syscon.h
index f0273c9e972b..8cfda0554381 100644
--- a/include/linux/mfd/syscon.h
+++ b/include/linux/mfd/syscon.h
@@ -19,7 +19,6 @@ struct device_node;
19#ifdef CONFIG_MFD_SYSCON 19#ifdef CONFIG_MFD_SYSCON
20extern struct regmap *syscon_node_to_regmap(struct device_node *np); 20extern struct regmap *syscon_node_to_regmap(struct device_node *np);
21extern struct regmap *syscon_regmap_lookup_by_compatible(const char *s); 21extern struct regmap *syscon_regmap_lookup_by_compatible(const char *s);
22extern struct regmap *syscon_regmap_lookup_by_pdevname(const char *s);
23extern struct regmap *syscon_regmap_lookup_by_phandle( 22extern struct regmap *syscon_regmap_lookup_by_phandle(
24 struct device_node *np, 23 struct device_node *np,
25 const char *property); 24 const char *property);
@@ -34,11 +33,6 @@ static inline struct regmap *syscon_regmap_lookup_by_compatible(const char *s)
34 return ERR_PTR(-ENOTSUPP); 33 return ERR_PTR(-ENOTSUPP);
35} 34}
36 35
37static inline struct regmap *syscon_regmap_lookup_by_pdevname(const char *s)
38{
39 return ERR_PTR(-ENOTSUPP);
40}
41
42static inline struct regmap *syscon_regmap_lookup_by_phandle( 36static inline struct regmap *syscon_regmap_lookup_by_phandle(
43 struct device_node *np, 37 struct device_node *np,
44 const char *property) 38 const char *property)