From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 13 Jul 2014 01:00:44 +0000 (-0700)
Subject: staging: lustre: remove LL_PROC_PROTO macro
X-Git-Tag: cleanup-for-v3.18~125^2~835
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bdb7ce4119b8b333797d67cf87d2475e56c6842;p=pandora-kernel.git

staging: lustre: remove LL_PROC_PROTO macro

Spell out what is happening with the proc file functions, it helps to
unwind the call chain mess here.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: hpdd-discuss <hpdd-discuss@lists.01.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
index 8125980089e8..43ce3a05f59b 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
@@ -64,13 +64,13 @@
 /*
  * Sysctl register
  */
-#define DECLARE_PROC_HANDLER(name)		      \
-static int					      \
-LL_PROC_PROTO(name)				     \
-{						       \
-	return proc_call_handler(table->data, write,    \
-				 ppos, buffer, lenp,    \
-				 __##name);	     \
+#define DECLARE_PROC_HANDLER(name)					\
+static int name(struct ctl_table *table, int write,			\
+		void __user *buffer, size_t *lenp, loff_t *ppos)	\
+{									\
+	return proc_call_handler(table->data, write,			\
+				 ppos, buffer, lenp,			\
+				 __##name);				\
 }
 
 #endif
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h b/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
index 192ad083931a..4fe072056da2 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
@@ -83,11 +83,6 @@
 
 #define ll_proc_dolongvec(table, write, filp, buffer, lenp, ppos)	\
 	proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
-#define ll_proc_dostring(table, write, filp, buffer, lenp, ppos)	\
-	proc_dostring(table, write, buffer, lenp, ppos);
-#define LL_PROC_PROTO(name)					     \
-	name(struct ctl_table *table, int write,		      \
-	     void __user *buffer, size_t *lenp, loff_t *ppos)
 
 /* helper for sysctl handlers */
 int proc_call_handler(void *data, int write,
Reading git-diff-tree failed