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 ...
This commit is contained in:
@@ -391,7 +391,7 @@ static int __init lkdtm_module_init(void)
|
||||
{
|
||||
struct crashpoint *crashpoint = NULL;
|
||||
const struct crashtype *crashtype = NULL;
|
||||
int ret = -EINVAL;
|
||||
int ret;
|
||||
int i;
|
||||
|
||||
/* Neither or both of these need to be set */
|
||||
@@ -434,22 +434,13 @@ static int __init lkdtm_module_init(void)
|
||||
|
||||
/* Register debugfs interface */
|
||||
lkdtm_debugfs_root = debugfs_create_dir("provoke-crash", NULL);
|
||||
if (!lkdtm_debugfs_root) {
|
||||
pr_err("creating root dir failed\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
/* Install debugfs trigger files. */
|
||||
for (i = 0; i < ARRAY_SIZE(crashpoints); i++) {
|
||||
struct crashpoint *cur = &crashpoints[i];
|
||||
struct dentry *de;
|
||||
|
||||
de = debugfs_create_file(cur->name, 0644, lkdtm_debugfs_root,
|
||||
cur, &cur->fops);
|
||||
if (de == NULL) {
|
||||
pr_err("could not create crashpoint %s\n", cur->name);
|
||||
goto out_err;
|
||||
}
|
||||
debugfs_create_file(cur->name, 0644, lkdtm_debugfs_root, cur,
|
||||
&cur->fops);
|
||||
}
|
||||
|
||||
/* Install crashpoint if one was selected. */
|
||||
|
Reference in New Issue
Block a user