Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

1 files changed, 19 insertions, 24 deletions

diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/iwlegacy/debug.c
index b1b8926a9c7b..bb7c95607a69 100644
--- a/drivers/net/wireless/iwlegacy/debug.c
+++ b/drivers/net/wireless/iwlegacy/debug.c
@@ -361,7 +361,7 @@ il_dbgfs_nvm_read(struct file *file, char __user *user_buf, size_t count,
         const u8 *ptr;
         char *buf;
         u16 eeprom_ver;
-        size_t eeprom_len = il->cfg->base_params->eeprom_size;
+        size_t eeprom_len = il->cfg->eeprom_size;
         buf_size = 4 * eeprom_len + 256;
 
         if (eeprom_len % 16) {
@@ -644,12 +644,10 @@ il_dbgfs_qos_read(struct file *file, char __user *user_buf, size_t count,
                   loff_t *ppos)
 {
         struct il_priv *il = file->private_data;
-        struct il_rxon_context *ctx = &il->ctx;
         int pos = 0, i;
         char buf[256];
         const size_t bufsz = sizeof(buf);
 
-        pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n", ctx->ctxid);
         for (i = 0; i < AC_NUM; i++) {
                 pos +=
                     scnprintf(buf + pos, bufsz - pos,
@@ -657,10 +655,10 @@ il_dbgfs_qos_read(struct file *file, char __user *user_buf, size_t count,
                 pos +=
                     scnprintf(buf + pos, bufsz - pos,
                               "AC[%d]\t%u\t%u\t%u\t%u\n", i,
-                              ctx->qos_data.def_qos_parm.ac[i].cw_min,
-                              ctx->qos_data.def_qos_parm.ac[i].cw_max,
-                              ctx->qos_data.def_qos_parm.ac[i].aifsn,
-                              ctx->qos_data.def_qos_parm.ac[i].edca_txop);
+                              il->qos_data.def_qos_parm.ac[i].cw_min,
+                              il->qos_data.def_qos_parm.ac[i].cw_max,
+                              il->qos_data.def_qos_parm.ac[i].aifsn,
+                              il->qos_data.def_qos_parm.ac[i].edca_txop);
         }
 
         return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
@@ -729,7 +727,7 @@ il_dbgfs_traffic_log_read(struct file *file, char __user *user_buf,
         char *buf;
         int bufsz =
             ((IL_TRAFFIC_ENTRIES * IL_TRAFFIC_ENTRY_SIZE * 64) * 2) +
-            (il->cfg->base_params->num_of_queues * 32 * 8) + 400;
+            (il->cfg->num_of_queues * 32 * 8) + 400;
         const u8 *ptr;
         ssize_t ret;
 
@@ -835,7 +833,7 @@ il_dbgfs_tx_queue_read(struct file *file, char __user *user_buf, size_t count,
         int cnt;
         int ret;
         const size_t bufsz =
-            sizeof(char) * 64 * il->cfg->base_params->num_of_queues;
+            sizeof(char) * 64 * il->cfg->num_of_queues;
 
         if (!il->txq) {
                 IL_ERR("txq not ready\n");
@@ -903,8 +901,7 @@ 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->cfg->ops->lib->debugfs_ops.rx_stats_read(file, user_buf,
-                                                            count, ppos);
+        return il->ops->lib->debugfs_ops.rx_stats_read(file, user_buf, count, ppos);
 }
 
 static ssize_t
@@ -912,8 +909,7 @@ 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->cfg->ops->lib->debugfs_ops.tx_stats_read(file, user_buf,
-                                                            count, ppos);
+        return il->ops->lib->debugfs_ops.tx_stats_read(file, user_buf, count, ppos);
 }
 
 static ssize_t
@@ -921,8 +917,7 @@ 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->cfg->ops->lib->debugfs_ops.general_stats_read(file, user_buf,
-                                                                 count, ppos);
+        return il->ops->lib->debugfs_ops.general_stats_read(file, user_buf, count, ppos);
 }
 
 static ssize_t
@@ -1153,7 +1148,7 @@ il_dbgfs_rxon_flags_read(struct file *file, char __user *user_buf,
         int len = 0;
         char buf[20];
 
-        len = sprintf(buf, "0x%04X\n", le32_to_cpu(il->ctx.active.flags));
+        len = sprintf(buf, "0x%04X\n", le32_to_cpu(il->active.flags));
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -1167,7 +1162,7 @@ il_dbgfs_rxon_filter_flags_read(struct file *file, char __user *user_buf,
         char buf[20];
 
         len =
-            sprintf(buf, "0x%04X\n", le32_to_cpu(il->ctx.active.filter_flags));
+            sprintf(buf, "0x%04X\n", le32_to_cpu(il->active.filter_flags));
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
@@ -1180,8 +1175,8 @@ il_dbgfs_fh_reg_read(struct file *file, char __user *user_buf, size_t count,
         int pos = 0;
         ssize_t ret = -EFAULT;
 
-        if (il->cfg->ops->lib->dump_fh) {
-                ret = pos = il->cfg->ops->lib->dump_fh(il, &buf, true);
+        if (il->ops->lib->dump_fh) {
+                ret = pos = il->ops->lib->dump_fh(il, &buf, true);
                 if (buf) {
                         ret =
                             simple_read_from_buffer(user_buf, count, ppos, buf,
@@ -1298,7 +1293,7 @@ il_dbgfs_wd_timeout_write(struct file *file, const char __user *user_buf,
         if (timeout < 0 || timeout > IL_MAX_WD_TIMEOUT)
                 timeout = IL_DEF_WD_TIMEOUT;
 
-        il->cfg->base_params->wd_timeout = timeout;
+        il->cfg->wd_timeout = timeout;
         il_setup_watchdog(il);
         return count;
 }
@@ -1372,17 +1367,17 @@ il_dbgfs_register(struct il_priv *il, const char *name)
         DEBUGFS_ADD_FILE(ucode_tx_stats, dir_debug, S_IRUSR);
         DEBUGFS_ADD_FILE(ucode_general_stats, dir_debug, S_IRUSR);
 
-        if (il->cfg->base_params->sensitivity_calib_by_driver)
+        if (il->cfg->sensitivity_calib_by_driver)
                 DEBUGFS_ADD_FILE(sensitivity, dir_debug, S_IRUSR);
-        if (il->cfg->base_params->chain_noise_calib_by_driver)
+        if (il->cfg->chain_noise_calib_by_driver)
                 DEBUGFS_ADD_FILE(chain_noise, dir_debug, S_IRUSR);
         DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR);
         DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR);
         DEBUGFS_ADD_FILE(wd_timeout, dir_debug, S_IWUSR);
-        if (il->cfg->base_params->sensitivity_calib_by_driver)
+        if (il->cfg->sensitivity_calib_by_driver)
                 DEBUGFS_ADD_BOOL(disable_sensitivity, dir_rf,
                                  &il->disable_sens_cal);
-        if (il->cfg->base_params->chain_noise_calib_by_driver)
+        if (il->cfg->chain_noise_calib_by_driver)
                 DEBUGFS_ADD_BOOL(disable_chain_noise, dir_rf,
                                  &il->disable_chain_noise_cal);
         DEBUGFS_ADD_BOOL(disable_tx_power, dir_rf, &il->disable_tx_power_cal);