diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-12 15:24:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-12 15:24:03 -0400 |
commit | f632a8170a6b667ee4e3f552087588f0fe13c4bb (patch) | |
tree | 9fbdd3505f1471364265727dea1bc9d034cbed8f /fs/debugfs/file.c | |
parent | ef8f3d48afd6a17a0dae8c277c2f539c2f19fd16 (diff) | |
parent | c33d442328f556460b79aba6058adb37bb555389 (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 'fs/debugfs/file.c')
-rw-r--r-- | fs/debugfs/file.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c index ddd708b09fa1..93e4ca6b2ad7 100644 --- a/fs/debugfs/file.c +++ b/fs/debugfs/file.c | |||
@@ -997,25 +997,19 @@ static const struct file_operations u32_array_fops = { | |||
997 | * @array as data. If the @mode variable is so set it can be read from. | 997 | * @array as data. If the @mode variable is so set it can be read from. |
998 | * Writing is not supported. Seek within the file is also not supported. | 998 | * Writing is not supported. Seek within the file is also not supported. |
999 | * Once array is created its size can not be changed. | 999 | * Once array is created its size can not be changed. |
1000 | * | ||
1001 | * The function returns a pointer to dentry on success. If an error occurs, | ||
1002 | * %ERR_PTR(-ERROR) or NULL will be returned. If debugfs is not enabled in | ||
1003 | * the kernel, the value %ERR_PTR(-ENODEV) will be returned. | ||
1004 | */ | 1000 | */ |
1005 | struct dentry *debugfs_create_u32_array(const char *name, umode_t mode, | 1001 | void debugfs_create_u32_array(const char *name, umode_t mode, |
1006 | struct dentry *parent, | 1002 | struct dentry *parent, u32 *array, u32 elements) |
1007 | u32 *array, u32 elements) | ||
1008 | { | 1003 | { |
1009 | struct array_data *data = kmalloc(sizeof(*data), GFP_KERNEL); | 1004 | struct array_data *data = kmalloc(sizeof(*data), GFP_KERNEL); |
1010 | 1005 | ||
1011 | if (data == NULL) | 1006 | if (data == NULL) |
1012 | return NULL; | 1007 | return; |
1013 | 1008 | ||
1014 | data->array = array; | 1009 | data->array = array; |
1015 | data->elements = elements; | 1010 | data->elements = elements; |
1016 | 1011 | ||
1017 | return debugfs_create_file_unsafe(name, mode, parent, data, | 1012 | debugfs_create_file_unsafe(name, mode, parent, data, &u32_array_fops); |
1018 | &u32_array_fops); | ||
1019 | } | 1013 | } |
1020 | EXPORT_SYMBOL_GPL(debugfs_create_u32_array); | 1014 | EXPORT_SYMBOL_GPL(debugfs_create_u32_array); |
1021 | 1015 | ||