From 217f7a22c049f2ccc24d2080cf7369f39fe3b6c5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 1 Jun 2018 13:10:01 +0200 Subject: [PATCH 383/454] staging: vc04_services: move client dbg directory into static variable commit 24e8d3fc42f25936ff270e404847a3a462c38468 upstream This does not need to be part of a wrapper function, or in a structure, just properly reference it directly as a single variable. The whole variable will be going away soon anyway, this is just a step toward that direction. Suggested-by: Eric Anholt Cc: Stefan Wahren Cc: Kees Cook Cc: Dan Carpenter Cc: Arnd Bergmann Cc: Keerthi Reddy Cc: linux-rpi-kernel@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Reviewed-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman --- .../interface/vchiq_arm/vchiq_debugfs.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c @@ -55,17 +55,15 @@ /* Top-level debug info */ struct vchiq_debugfs_info { - /* one entry per client process */ - struct dentry *clients; - /* log categories */ struct dentry *log_categories; }; static struct vchiq_debugfs_info debugfs_info; -/* Global 'vchiq' debugfs entry used by all instances */ +/* Global 'vchiq' debugfs and clients entry used by all instances */ struct dentry *vchiq_dbg_dir; +struct dentry *vchiq_dbg_clients; /* Log category debugfs entries */ struct vchiq_debugfs_log_entry { @@ -83,8 +81,6 @@ static struct vchiq_debugfs_log_entry vc }; static int n_log_entries = ARRAY_SIZE(vchiq_debugfs_log_entries); -static struct dentry *vchiq_clients_top(void); - static int debugfs_log_show(struct seq_file *f, void *offset) { int *levp = f->private; @@ -264,12 +260,11 @@ void vchiq_debugfs_add_instance(VCHIQ_IN { char pidstr[16]; struct dentry *top; - struct dentry *clients = vchiq_clients_top(); snprintf(pidstr, sizeof(pidstr), "%d", vchiq_instance_get_pid(instance)); - top = debugfs_create_dir(pidstr, clients); + top = debugfs_create_dir(pidstr, vchiq_dbg_clients); debugfs_create_file("use_count", 0444, top, instance, &debugfs_usecount_fops); @@ -288,7 +283,7 @@ void vchiq_debugfs_remove_instance(VCHIQ void vchiq_debugfs_init(void) { vchiq_dbg_dir = debugfs_create_dir("vchiq", NULL); - debugfs_info.clients = debugfs_create_dir("clients", vchiq_dbg_dir); + vchiq_dbg_clients = debugfs_create_dir("clients", vchiq_dbg_dir); vchiq_debugfs_create_log_entries(vchiq_dbg_dir); } @@ -299,11 +294,6 @@ void vchiq_debugfs_deinit(void) debugfs_remove_recursive(vchiq_dbg_dir); } -static struct dentry *vchiq_clients_top(void) -{ - return debugfs_info.clients; -} - #else /* CONFIG_DEBUG_FS */ void vchiq_debugfs_init(void)