From a0884f713e51934f6ce89489c4f5f8c04faf8c71 Mon Sep 17 00:00:00 2001
From: Greg Dietsche <Gregory.Dietsche@cuw.edu>
Date: Tue, 6 Sep 2011 19:11:35 -0500
Subject: [PATCH] --- yaml --- r: 278213 b: refs/heads/master c:
 9b5e2f463ac6f53789bd5ce43d2bb4b4c01e8607 h: refs/heads/master i:   278211:
 727f5decce0ada4cf10686d86e2419f0661a1c3c v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/net/wireless/iwlegacy/3945.c   |  2 ++
 trunk/drivers/net/wireless/iwlegacy/3945.h   | 21 --------------------
 trunk/drivers/net/wireless/iwlegacy/4965.c   |  2 ++
 trunk/drivers/net/wireless/iwlegacy/4965.h   | 21 --------------------
 trunk/drivers/net/wireless/iwlegacy/common.h |  4 ++++
 6 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/[refs] b/[refs]
index f25346b284b8..3045ab73f595 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3a2c775336641663b1c38dfa7dd8a1c1210ae23
+refs/heads/master: 9b5e2f463ac6f53789bd5ce43d2bb4b4c01e8607
diff --git a/trunk/drivers/net/wireless/iwlegacy/3945.c b/trunk/drivers/net/wireless/iwlegacy/3945.c
index 7367dbb75ec6..863664f9ba8b 100644
--- a/trunk/drivers/net/wireless/iwlegacy/3945.c
+++ b/trunk/drivers/net/wireless/iwlegacy/3945.c
@@ -2671,11 +2671,13 @@ static struct il_lib_ops il3945_lib = {
 	.send_tx_power = il3945_send_tx_power,
 	.is_valid_rtc_data_addr = il3945_hw_valid_rtc_data_addr,
 
+#ifdef CONFIG_IWLEGACY_DEBUGFS
 	.debugfs_ops = {
 			.rx_stats_read = il3945_ucode_rx_stats_read,
 			.tx_stats_read = il3945_ucode_tx_stats_read,
 			.general_stats_read = il3945_ucode_general_stats_read,
 			},
+#endif
 };
 
 static const struct il_legacy_ops il3945_legacy_ops = {
diff --git a/trunk/drivers/net/wireless/iwlegacy/3945.h b/trunk/drivers/net/wireless/iwlegacy/3945.h
index 00d3336fd16b..2b2895c544d7 100644
--- a/trunk/drivers/net/wireless/iwlegacy/3945.h
+++ b/trunk/drivers/net/wireless/iwlegacy/3945.h
@@ -621,27 +621,6 @@ ssize_t il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,
 ssize_t il3945_ucode_general_stats_read(struct file *file,
 					char __user *user_buf, size_t count,
 					loff_t *ppos);
-#else
-static ssize_t
-il3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,
-			   size_t count, loff_t *ppos)
-{
-	return 0;
-}
-
-static ssize_t
-il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,
-			   size_t count, loff_t *ppos)
-{
-	return 0;
-}
-
-static ssize_t
-il3945_ucode_general_stats_read(struct file *file, char __user *user_buf,
-				size_t count, loff_t *ppos)
-{
-	return 0;
-}
 #endif
 
 #endif
diff --git a/trunk/drivers/net/wireless/iwlegacy/4965.c b/trunk/drivers/net/wireless/iwlegacy/4965.c
index ac80a0069124..84c54dccf195 100644
--- a/trunk/drivers/net/wireless/iwlegacy/4965.c
+++ b/trunk/drivers/net/wireless/iwlegacy/4965.c
@@ -2333,11 +2333,13 @@ static struct il_lib_ops il4965_lib = {
 	.temp_ops = {
 		     .temperature = il4965_temperature_calib,
 		     },
+#ifdef CONFIG_IWLEGACY_DEBUGFS
 	.debugfs_ops = {
 			.rx_stats_read = il4965_ucode_rx_stats_read,
 			.tx_stats_read = il4965_ucode_tx_stats_read,
 			.general_stats_read = il4965_ucode_general_stats_read,
 			},
+#endif
 };
 
 static const struct il_legacy_ops il4965_legacy_ops = {
diff --git a/trunk/drivers/net/wireless/iwlegacy/4965.h b/trunk/drivers/net/wireless/iwlegacy/4965.h
index ded8b922a44e..74472314bc37 100644
--- a/trunk/drivers/net/wireless/iwlegacy/4965.h
+++ b/trunk/drivers/net/wireless/iwlegacy/4965.h
@@ -956,27 +956,6 @@ ssize_t il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,
 ssize_t il4965_ucode_general_stats_read(struct file *file,
 					char __user *user_buf, size_t count,
 					loff_t *ppos);
-#else
-static ssize_t
-il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
-			   size_t count, loff_t *ppos)
-{
-	return 0;
-}
-
-static ssize_t
-il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,
-			   size_t count, loff_t *ppos)
-{
-	return 0;
-}
-
-static ssize_t
-il4965_ucode_general_stats_read(struct file *file, char __user *user_buf,
-				size_t count, loff_t *ppos)
-{
-	return 0;
-}
 #endif
 
 /****************************/
diff --git a/trunk/drivers/net/wireless/iwlegacy/common.h b/trunk/drivers/net/wireless/iwlegacy/common.h
index d0975ab8b908..1bc0b02f559c 100644
--- a/trunk/drivers/net/wireless/iwlegacy/common.h
+++ b/trunk/drivers/net/wireless/iwlegacy/common.h
@@ -1631,6 +1631,7 @@ struct il_apm_ops {
 	void (*config) (struct il_priv *il);
 };
 
+#ifdef CONFIG_IWLEGACY_DEBUGFS
 struct il_debugfs_ops {
 	ssize_t(*rx_stats_read) (struct file *file, char __user *user_buf,
 				 size_t count, loff_t *ppos);
@@ -1640,6 +1641,7 @@ struct il_debugfs_ops {
 				      char __user *user_buf, size_t count,
 				      loff_t *ppos);
 };
+#endif
 
 struct il_temp_ops {
 	void (*temperature) (struct il_priv *il);
@@ -1683,7 +1685,9 @@ struct il_lib_ops {
 	/* temperature */
 	struct il_temp_ops temp_ops;
 
+#ifdef CONFIG_IWLEGACY_DEBUGFS
 	struct il_debugfs_ops debugfs_ops;
+#endif
 
 };