iwlegacy: rename iwl to il
iwl_legacy prefix result in long function names, what cause that we
have frequent line split and not readable code. Also iwl_foo symbols
are duplicated in iwlwifi driver, what is annoying when editing
kernel tree with cscope.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c b/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
index 1c93665..3c2876f 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
@@ -33,7 +33,7 @@
static const char *fmt_header =
"%-32s current cumulative delta max\n";
-static int iwl4965_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
+static int il4965_statistics_flag(struct il_priv *priv, char *buf, int bufsz)
{
int p = 0;
u32 flag;
@@ -54,10 +54,10 @@
return p;
}
-ssize_t iwl4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
+ssize_t il4965_ucode_rx_stats_read(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos)
{
- struct iwl_priv *priv = file->private_data;
+ struct il_priv *priv = file->private_data;
int pos = 0;
char *buf;
int bufsz = sizeof(struct statistics_rx_phy) * 40 +
@@ -70,12 +70,12 @@
struct statistics_rx_non_phy *delta_general, *max_general;
struct statistics_rx_ht_phy *ht, *accum_ht, *delta_ht, *max_ht;
- if (!iwl_legacy_is_alive(priv))
+ if (!il_is_alive(priv))
return -EAGAIN;
buf = kzalloc(bufsz, GFP_KERNEL);
if (!buf) {
- IWL_ERR(priv, "Can not allocate Buffer\n");
+ IL_ERR(priv, "Can not allocate Buffer\n");
return -ENOMEM;
}
@@ -101,7 +101,7 @@
max_general = &priv->_4965.max_delta.rx.general;
max_ht = &priv->_4965.max_delta.rx.ofdm_ht;
- pos += iwl4965_statistics_flag(priv, buf, bufsz);
+ pos += il4965_statistics_flag(priv, buf, bufsz);
pos += scnprintf(buf + pos, bufsz - pos,
fmt_header, "Statistics_Rx - OFDM:");
pos += scnprintf(buf + pos, bufsz - pos,
@@ -485,23 +485,23 @@
return ret;
}
-ssize_t iwl4965_ucode_tx_stats_read(struct file *file,
+ssize_t il4965_ucode_tx_stats_read(struct file *file,
char __user *user_buf,
size_t count, loff_t *ppos)
{
- struct iwl_priv *priv = file->private_data;
+ struct il_priv *priv = file->private_data;
int pos = 0;
char *buf;
int bufsz = (sizeof(struct statistics_tx) * 48) + 250;
ssize_t ret;
struct statistics_tx *tx, *accum_tx, *delta_tx, *max_tx;
- if (!iwl_legacy_is_alive(priv))
+ if (!il_is_alive(priv))
return -EAGAIN;
buf = kzalloc(bufsz, GFP_KERNEL);
if (!buf) {
- IWL_ERR(priv, "Can not allocate Buffer\n");
+ IL_ERR(priv, "Can not allocate Buffer\n");
return -ENOMEM;
}
@@ -514,7 +514,7 @@
delta_tx = &priv->_4965.delta_statistics.tx;
max_tx = &priv->_4965.max_delta.tx;
- pos += iwl4965_statistics_flag(priv, buf, bufsz);
+ pos += il4965_statistics_flag(priv, buf, bufsz);
pos += scnprintf(buf + pos, bufsz - pos,
fmt_header, "Statistics_Tx:");
pos += scnprintf(buf + pos, bufsz - pos,
@@ -661,10 +661,10 @@
}
ssize_t
-iwl4965_ucode_general_stats_read(struct file *file, char __user *user_buf,
+il4965_ucode_general_stats_read(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos)
{
- struct iwl_priv *priv = file->private_data;
+ struct il_priv *priv = file->private_data;
int pos = 0;
char *buf;
int bufsz = sizeof(struct statistics_general) * 10 + 300;
@@ -674,12 +674,12 @@
struct statistics_dbg *dbg, *accum_dbg, *delta_dbg, *max_dbg;
struct statistics_div *div, *accum_div, *delta_div, *max_div;
- if (!iwl_legacy_is_alive(priv))
+ if (!il_is_alive(priv))
return -EAGAIN;
buf = kzalloc(bufsz, GFP_KERNEL);
if (!buf) {
- IWL_ERR(priv, "Can not allocate Buffer\n");
+ IL_ERR(priv, "Can not allocate Buffer\n");
return -ENOMEM;
}
@@ -700,7 +700,7 @@
delta_div = &priv->_4965.delta_statistics.general.common.div;
max_div = &priv->_4965.max_delta.general.common.div;
- pos += iwl4965_statistics_flag(priv, buf, bufsz);
+ pos += il4965_statistics_flag(priv, buf, bufsz);
pos += scnprintf(buf + pos, bufsz - pos,
fmt_header, "Statistics_General:");
pos += scnprintf(buf + pos, bufsz - pos,