diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-11-27 11:09:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-11-27 11:10:50 +0100 |
| commit | a787bdaff83a085288b6fc607afb4bb648da3cc9 (patch) | |
| tree | ec389c1494ef4790ea90f65c4f86e523caf325d0 /fs/debugfs/file.c | |
| parent | 2914b0ba61a9d253535e51af16c7122a8148995d (diff) | |
| parent | 85a2c56cb4454c73f56d3099d96942e7919b292f (diff) | |
| download | lwn-a787bdaff83a085288b6fc607afb4bb648da3cc9.tar.gz lwn-a787bdaff83a085288b6fc607afb4bb648da3cc9.zip | |
Merge branch 'linus' into sched/core, to resolve semantic conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/debugfs/file.c')
| -rw-r--r-- | fs/debugfs/file.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c index a768a09430c3..686e0ad28788 100644 --- a/fs/debugfs/file.c +++ b/fs/debugfs/file.c @@ -1127,24 +1127,23 @@ static const struct file_operations debugfs_devm_entry_ops = { * file will be created in the root of the debugfs filesystem. * @read_fn: function pointer called to print the seq_file content. */ -struct dentry *debugfs_create_devm_seqfile(struct device *dev, const char *name, - struct dentry *parent, - int (*read_fn)(struct seq_file *s, - void *data)) +void debugfs_create_devm_seqfile(struct device *dev, const char *name, + struct dentry *parent, + int (*read_fn)(struct seq_file *s, void *data)) { struct debugfs_devm_entry *entry; if (IS_ERR(parent)) - return ERR_PTR(-ENOENT); + return; entry = devm_kzalloc(dev, sizeof(*entry), GFP_KERNEL); if (!entry) - return ERR_PTR(-ENOMEM); + return; entry->read = read_fn; entry->dev = dev; - return debugfs_create_file(name, S_IRUGO, parent, entry, - &debugfs_devm_entry_ops); + debugfs_create_file(name, S_IRUGO, parent, entry, + &debugfs_devm_entry_ops); } EXPORT_SYMBOL_GPL(debugfs_create_devm_seqfile); |