[Acx100-devel] [PATCH 02/19] debugfs: refine config/build choices

[Jim C. <jim...@gm...>]

Patch started as make check cleanup, grew into build refinement.
Generally, it tightens up #ifdefs which enable code for debugfs and
procfs interfaces.

- change #ifdef CONFIG_PROC_FS to CONFIG_PROC_FS || CONFIG_DEBUG_FS,
  to enable file callbacks for procfs and/or debugfs.

- declare proc_(show|write)_funcs[] in merge.h (we have no common.h),
  along with the supporting typedefs.  Drop those typedefs in common.c
  and in debugfs.c (which now includes merge.h)

- #ifdef ACX_WANT_PROC_FILES_ANYWAY controls presence of proc-files,
   needed in addition to CONFIG_PROC_FS (since debugfs is preserved).
   Probably should enable it automatically when CONFIG_DEBUG_FS=n.

Signed-off-by: Jim Cromie <jim...@gm...>
---
 common.c  | 32 +++++++++++++++-----------------
 debugfs.c | 10 +++-------
 merge.h   | 10 ++++++++++
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/common.c b/common.c
index 5746c38..6f79a42 100644
--- a/common.c
+++ b/common.c
@@ -703,16 +703,20 @@ u16 acx_rate111_hwvalue_to_bitrate(u16 hw_value)
 	return (bitrate);
 }
 
-/* Proc */
-#ifdef CONFIG_PROC_FS
-
+#if defined CONFIG_PROC_FS || defined CONFIG_PROC_FS
+/*
+ * debugfs.c provides new interface to the "files", procfs interface
+ * is deprecated for new stuff.  Keep PROC_FS facility for users with
+ * non-DEBUG_FS kernels, so keep handlers themselves here.
+ */
+#ifdef ACX_WANT_PROC_FILES_ANYWAY
+/* obsoleted by debugfs.c */
 static const char *const proc_files[] = {
 	"info", "diag", "eeprom", "phy", "debug",
 	"sensitivity", "tx_level", "antenna", "reg_domain",
 };
-
-typedef int acx_proc_show_t(struct seq_file *file, void *v);
-typedef ssize_t (acx_proc_write_t)(struct file *, const char __user *, size_t, loff_t *);
+static struct file_operations acx_e_proc_ops[ARRAY_SIZE(proc_files)];
+#endif /* ACX_WANT_PROC_FILES_ANYWAY */
 
 acx_proc_show_t *const acx_proc_show_funcs[] = {
 	acx_proc_show_acx,
@@ -725,8 +729,6 @@ acx_proc_show_t *const acx_proc_show_funcs[] = {
 	acx_proc_show_antenna,
 	acx_proc_show_reg_domain,
 };
-BUILD_BUG_DECL(proc_files__VS__acx_proc_show_funcs,
-	ARRAY_SIZE(proc_files) != ARRAY_SIZE(acx_proc_show_funcs));
 
 acx_proc_write_t *const acx_proc_write_funcs[] = {
 	NULL,
@@ -742,11 +744,6 @@ acx_proc_write_t *const acx_proc_write_funcs[] = {
 BUILD_BUG_DECL(SHOW, ARRAY_SIZE(acx_proc_show_funcs)
 		  != ARRAY_SIZE(acx_proc_write_funcs));
 
-#ifndef CONFIG_DEBUG_FS
-/* obsoleted */
-static struct file_operations acx_e_proc_ops[ARRAY_SIZE(proc_files)];
-#endif
-
 #endif /* CONFIG_PROC_FS */
 
 /*
@@ -4915,7 +4912,8 @@ out:
 	return ret;
 }
 
-#if 0 /* now in debugfs.c */
+#ifdef ACX_WANT_PROC_FILES_ANYWAY
+
 static int acx_proc_open(struct inode *inode, struct file *file)
 {
 	int i;
@@ -5018,9 +5016,9 @@ int acx_proc_unregister_entries(struct ieee80211_hw *hw)
 	FN_EXIT0;
 	return OK;
 }
-#else /* now in debugfs.c */
-void acx_proc_init(void) { }	/* stub */
-#endif /* now in debugfs.c */
+#else /* ACX_WANT_PROC_FILES_ANYWAY */
+static void acx_proc_init(void) { }	/* stub */
+#endif /* ACX_WANT_PROC_FILES_ANYWAY */
 
 #endif /* defined(CONFIG_PROC_FS) || defined(CONFIG_DEBUGC_FS) */
 
diff --git a/debugfs.c b/debugfs.c
index 8ad57b4..10fff7f 100644
--- a/debugfs.c
+++ b/debugfs.c
@@ -17,13 +17,7 @@ void acx_debugfs_remove_adev(struct acx_device *adev) { return 0; }
 #include <linux/seq_file.h>
 #include <net/mac80211.h>
 #include "acx.h"
-
-typedef int acx_proc_show_t(struct seq_file *file, void *v);
-typedef ssize_t (acx_proc_write_t)(struct file *, const char __user *,
-				size_t, loff_t *);
-
-extern acx_proc_show_t *const acx_proc_show_funcs[];
-extern acx_proc_write_t *const acx_proc_write_funcs[];
+#include "merge.h" /* for acx_proc_(show|write)_funcs[]; */
 
 /*
  * debugfs files are created under $DBGMNT/acx_mac80211/phyX by
@@ -56,6 +50,8 @@ static const char *const dbgfs_files[] = {
 	[ANTENNA]	= "antenna",
 	[REG_DOMAIN]	= "reg_domain",
 };
+BUILD_BUG_DECL(dbgfs_files__VS__enum_REG_DOMAIN,
+	ARRAY_SIZE(dbgfs_files) != REG_DOMAIN + 1);
 
 static int acx_dbgfs_open(struct inode *inode, struct file *file)
 {
diff --git a/merge.h b/merge.h
index fcac272..23eaa64 100644
--- a/merge.h
+++ b/merge.h
@@ -1,6 +1,16 @@
 #ifndef _MERGE_H_
 #define _MERGE_H_
 
+/* these 2 externs are defined in common.c (but we dont have a
+ * common.h), so expose them here.  Theyre used in debugfs.c
+ */
+typedef int acx_proc_show_t(struct seq_file *file, void *v);
+typedef ssize_t ((acx_proc_write_t)(struct file *, const char __user *,
+				    size_t, loff_t *));
+
+extern acx_proc_show_t *const acx_proc_show_funcs[];
+extern acx_proc_write_t *const acx_proc_write_funcs[];
+
 #include <linux/interrupt.h>
 
 irqreturn_t acx_interrupt(int irq, void *dev_id);
-- 
1.7.10.1.487.ga3935e6