iwlegacy: move debugfs_ops to il_priv

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

10 files changed, 30 insertions, 38 deletions

diff --git a/drivers/net/wireless/iwlegacy/3945-debug.c b/drivers/net/wireless/iwlegacy/3945-debug.c
index 5e1a19fd354d..f767dd106b09 100644
--- a/drivers/net/wireless/iwlegacy/3945-debug.c
+++ b/drivers/net/wireless/iwlegacy/3945-debug.c
@@ -503,3 +503,9 @@ il3945_ucode_general_stats_read(struct file *file, char __user *user_buf,
         kfree(buf);
         return ret;
 }
+
+const struct il_debugfs_ops il3945_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,
+};
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index 63ec05b15ba3..b7d5ebc512d3 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -3619,6 +3619,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         D_INFO("*** LOAD DRIVER ***\n");
         il->cfg = cfg;
         il->ops = &il3945_ops;
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+        il->debugfs_ops = &il3945_debugfs_ops;
+#endif
         il->pci_dev = pdev;
         il->inta_mask = CSR_INI_SET_MASK;
 
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c
index 66a5dc072eb2..4e63e7d48a7b 100644
--- a/drivers/net/wireless/iwlegacy/3945.c
+++ b/drivers/net/wireless/iwlegacy/3945.c
@@ -2651,14 +2651,6 @@ 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/drivers/net/wireless/iwlegacy/3945.h b/drivers/net/wireless/iwlegacy/3945.h
index c00a8d30b6fe..1d45075e0d5b 100644
--- a/drivers/net/wireless/iwlegacy/3945.h
+++ b/drivers/net/wireless/iwlegacy/3945.h
@@ -595,13 +595,7 @@ struct il3945_tfd {
 } __packed;
 
 #ifdef CONFIG_IWLEGACY_DEBUGFS
-ssize_t il3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,
-                                   size_t count, loff_t *ppos);
-ssize_t il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,
-                                   size_t count, loff_t *ppos);
-ssize_t il3945_ucode_general_stats_read(struct file *file,
-                                        char __user *user_buf, size_t count,
-                                        loff_t *ppos);
+extern const struct il_debugfs_ops il3945_debugfs_ops;
 #endif
 
 #endif
diff --git a/drivers/net/wireless/iwlegacy/4965-debug.c b/drivers/net/wireless/iwlegacy/4965-debug.c
index 98ec39f56ba3..c8153fc64f74 100644
--- a/drivers/net/wireless/iwlegacy/4965-debug.c
+++ b/drivers/net/wireless/iwlegacy/4965-debug.c
@@ -744,3 +744,9 @@ il4965_ucode_general_stats_read(struct file *file, char __user *user_buf,
         kfree(buf);
         return ret;
 }
+
+const struct il_debugfs_ops il4965_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,
+};
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 4560021bb96d..36f85f289a25 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -6483,6 +6483,9 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         D_INFO("*** LOAD DRIVER ***\n");
         il->cfg = cfg;
         il->ops = &il4965_ops;
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+        il->debugfs_ops = &il4965_debugfs_ops;
+#endif
         il->pci_dev = pdev;
         il->inta_mask = CSR_INI_SET_MASK;
 
diff --git a/drivers/net/wireless/iwlegacy/4965.c b/drivers/net/wireless/iwlegacy/4965.c
index cf49a7af6c6e..34fa3db82292 100644
--- a/drivers/net/wireless/iwlegacy/4965.c
+++ b/drivers/net/wireless/iwlegacy/4965.c
@@ -1913,13 +1913,6 @@ 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/drivers/net/wireless/iwlegacy/4965.h b/drivers/net/wireless/iwlegacy/4965.h
index befa7e60e956..b3fcb8f30fe9 100644
--- a/drivers/net/wireless/iwlegacy/4965.h
+++ b/drivers/net/wireless/iwlegacy/4965.h
@@ -928,13 +928,7 @@ void il4965_calib_free_results(struct il_priv *il);
 
 /* Debug */
 #ifdef CONFIG_IWLEGACY_DEBUGFS
-ssize_t il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
-                                   size_t count, loff_t *ppos);
-ssize_t il4965_ucode_tx_stats_read(struct file *file, char __user *user_buf,
-                                   size_t count, loff_t *ppos);
-ssize_t il4965_ucode_general_stats_read(struct file *file,
-                                        char __user *user_buf, size_t count,
-                                        loff_t *ppos);
+extern const struct il_debugfs_ops il4965_debugfs_ops;
 #endif
 
 /****************************/
diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index 1c0d969e9cf7..cd8f27d18b1c 100644
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -1155,13 +1155,15 @@ struct il_power_mgr {
 };
 
 struct il_priv {
-
-        /* ieee device used by generic ieee processing code */
         struct ieee80211_hw *hw;
         struct ieee80211_channel *ieee_channels;
         struct ieee80211_rate *ieee_rates;
+
         struct il_cfg *cfg;
         const struct il_ops *ops;
+#ifdef CONFIG_IWLEGACY_DEBUGFS
+        const struct il_debugfs_ops *debugfs_ops;
+#endif
 
         /* temporary frame storage list */
         struct list_head free_frames;
@@ -1624,10 +1626,6 @@ struct il_lib_ops {
         /* temperature */
         struct il_temp_ops temp_ops;
 
-#ifdef CONFIG_IWLEGACY_DEBUGFS
-        struct il_debugfs_ops debugfs_ops;
-#endif
-
 };
 
 struct il_led_ops {
diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/iwlegacy/debug.c
index bb7c95607a69..5091db813d66 100644
--- a/drivers/net/wireless/iwlegacy/debug.c
+++ b/drivers/net/wireless/iwlegacy/debug.c
@@ -901,7 +901,8 @@ il_dbgfs_ucode_rx_stats_read(struct file *file, char __user *user_buf,
                              size_t count, loff_t *ppos)
 {
         struct il_priv *il = file->private_data;
-        return il->ops->lib->debugfs_ops.rx_stats_read(file, user_buf, count, ppos);
+
+        return il->debugfs_ops->rx_stats_read(file, user_buf, count, ppos);
 }
 
 static ssize_t
@@ -909,7 +910,8 @@ il_dbgfs_ucode_tx_stats_read(struct file *file, char __user *user_buf,
                              size_t count, loff_t *ppos)
 {
         struct il_priv *il = file->private_data;
-        return il->ops->lib->debugfs_ops.tx_stats_read(file, user_buf, count, ppos);
+
+        return il->debugfs_ops->tx_stats_read(file, user_buf, count, ppos);
 }
 
 static ssize_t
@@ -917,7 +919,8 @@ il_dbgfs_ucode_general_stats_read(struct file *file, char __user *user_buf,
                                   size_t count, loff_t *ppos)
 {
         struct il_priv *il = file->private_data;
-        return il->ops->lib->debugfs_ops.general_stats_read(file, user_buf, count, ppos);
+
+        return il->debugfs_ops->general_stats_read(file, user_buf, count, ppos);
 }
 
 static ssize_t