OpenWrt – Rev 4

Subversion Repositories:
Rev:
From d661bf1a882cc7123f84fcf3ccf210b19929a47b Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 1 Jun 2018 13:10:02 +0200
Subject: [PATCH 384/454] staging: vc04_services: remove struct
 vchiq_debugfs_info

commit 127892febb2d5d6612756da2d7d0bab526db3b51 upstream

This structure, and the one static variable that was declared with it,
were not being used for anything.  The log_categories field was being
set, but never used again.  So just remove it entirely as it is not
needed at all.

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           | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
@@ -52,15 +52,6 @@
 #define VCHIQ_LOG_INFO_STR    "info"
 #define VCHIQ_LOG_TRACE_STR   "trace"
 
-
-/* Top-level debug info */
-struct vchiq_debugfs_info {
-       /* log categories */
-       struct dentry *log_categories;
-};
-
-static struct vchiq_debugfs_info debugfs_info;
-
 /* Global 'vchiq' debugfs and clients entry used by all instances */
 struct dentry *vchiq_dbg_dir;
 struct dentry *vchiq_dbg_clients;
@@ -161,16 +152,12 @@ static void vchiq_debugfs_create_log_ent
        size_t i;
 
        dir = debugfs_create_dir("log", vchiq_dbg_dir);
-       debugfs_info.log_categories = dir;
 
        for (i = 0; i < n_log_entries; i++) {
                void *levp = (void *)vchiq_debugfs_log_entries[i].plevel;
 
                dir = debugfs_create_file(vchiq_debugfs_log_entries[i].name,
-                                         0644,
-                                         debugfs_info.log_categories,
-                                         levp,
-                                         &debugfs_log_fops);
+                                         0644, dir, levp, &debugfs_log_fops);
                vchiq_debugfs_log_entries[i].dir = dir;
        }
 }