You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
84 lines
2.8 KiB
Diff
84 lines
2.8 KiB
Diff
6 years ago
|
From 4940fd338dc53324603c0bd2642b0a3864baa5fe Mon Sep 17 00:00:00 2001
|
||
|
|
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||
|
|
Date: Fri, 1 Jun 2018 13:10:04 +0200
|
||
|
|
Subject: [PATCH 386/454] staging: vc04_services: no need to save the log
|
||
|
|
debufs dentries
|
||
|
|
|
||
|
|
commit 3b93c0f4b6accb8105152900d7e414593a8b0c79 upstream
|
||
|
|
|
||
|
|
The log entry dentries are only set, never referenced, so no need to
|
||
|
|
keep them around. Remove the pointer from struct
|
||
|
|
vchiq_debugfs_log_entry as it is not needed anymore and get rid of the
|
||
|
|
separate vchiq_debugfs_create_log_entries() function as it is only used
|
||
|
|
in one place.
|
||
|
|
|
||
|
|
Suggested-by: Eric Anholt <eric@anholt.net>
|
||
|
|
Cc: Stefan Wahren <stefan.wahren@i2se.com>
|
||
|
|
Cc: Kees Cook <keescook@chromium.org>
|
||
|
|
Cc: Dan Carpenter <dan.carpenter@oracle.com>
|
||
|
|
Cc: Arnd Bergmann <arnd@arndb.de>
|
||
|
|
Cc: Keerthi Reddy <keerthigd4990@gmail.com>
|
||
|
|
Cc: linux-rpi-kernel@lists.infradead.org
|
||
|
|
Cc: linux-arm-kernel@lists.infradead.org
|
||
|
|
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||
|
|
---
|
||
|
|
.../interface/vchiq_arm/vchiq_debugfs.c | 29 +++++++------------
|
||
|
|
1 file changed, 10 insertions(+), 19 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
|
||
|
|
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
|
||
|
|
@@ -60,7 +60,6 @@ struct dentry *vchiq_dbg_clients;
|
||
|
|
struct vchiq_debugfs_log_entry {
|
||
|
|
const char *name;
|
||
|
|
void *plevel;
|
||
|
|
- struct dentry *dir;
|
||
|
|
};
|
||
|
|
|
||
|
|
static struct vchiq_debugfs_log_entry vchiq_debugfs_log_entries[] = {
|
||
|
|
@@ -145,23 +144,6 @@ static const struct file_operations debu
|
||
|
|
.release = single_release,
|
||
|
|
};
|
||
|
|
|
||
|
|
-/* create an entry under <debugfs>/vchiq/log for each log category */
|
||
|
|
-static void vchiq_debugfs_create_log_entries(struct dentry *top)
|
||
|
|
-{
|
||
|
|
- struct dentry *dir;
|
||
|
|
- size_t i;
|
||
|
|
-
|
||
|
|
- dir = debugfs_create_dir("log", vchiq_dbg_dir);
|
||
|
|
-
|
||
|
|
- for (i = 0; i < n_log_entries; i++) {
|
||
|
|
- dir = debugfs_create_file(vchiq_debugfs_log_entries[i].name,
|
||
|
|
- 0644, dir,
|
||
|
|
- vchiq_debugfs_log_entries[i].plevel,
|
||
|
|
- &debugfs_log_fops);
|
||
|
|
- vchiq_debugfs_log_entries[i].dir = dir;
|
||
|
|
- }
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
static int debugfs_usecount_show(struct seq_file *f, void *offset)
|
||
|
|
{
|
||
|
|
VCHIQ_INSTANCE_T instance = f->private;
|
||
|
|
@@ -269,10 +251,19 @@ void vchiq_debugfs_remove_instance(VCHIQ
|
||
|
|
|
||
|
|
void vchiq_debugfs_init(void)
|
||
|
|
{
|
||
|
|
+ struct dentry *dir;
|
||
|
|
+ int i;
|
||
|
|
+
|
||
|
|
vchiq_dbg_dir = debugfs_create_dir("vchiq", NULL);
|
||
|
|
vchiq_dbg_clients = debugfs_create_dir("clients", vchiq_dbg_dir);
|
||
|
|
|
||
|
|
- vchiq_debugfs_create_log_entries(vchiq_dbg_dir);
|
||
|
|
+ /* create an entry under <debugfs>/vchiq/log for each log category */
|
||
|
|
+ dir = debugfs_create_dir("log", vchiq_dbg_dir);
|
||
|
|
+
|
||
|
|
+ for (i = 0; i < n_log_entries; i++)
|
||
|
|
+ debugfs_create_file(vchiq_debugfs_log_entries[i].name, 0644,
|
||
|
|
+ dir, vchiq_debugfs_log_entries[i].plevel,
|
||
|
|
+ &debugfs_log_fops);
|
||
|
|
}
|
||
|
|
|
||
|
|
/* remove all the debugfs entries */
|