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-hcmd.c b/drivers/net/wireless/iwlegacy/iwl-hcmd.c
index ce1fc9f..515befc 100644
--- a/drivers/net/wireless/iwlegacy/iwl-hcmd.c
+++ b/drivers/net/wireless/iwlegacy/iwl-hcmd.c
@@ -37,66 +37,66 @@
#include "iwl-core.h"
-const char *iwl_legacy_get_cmd_string(u8 cmd)
+const char *il_get_cmd_string(u8 cmd)
{
switch (cmd) {
- IWL_CMD(REPLY_ALIVE);
- IWL_CMD(REPLY_ERROR);
- IWL_CMD(REPLY_RXON);
- IWL_CMD(REPLY_RXON_ASSOC);
- IWL_CMD(REPLY_QOS_PARAM);
- IWL_CMD(REPLY_RXON_TIMING);
- IWL_CMD(REPLY_ADD_STA);
- IWL_CMD(REPLY_REMOVE_STA);
- IWL_CMD(REPLY_WEPKEY);
- IWL_CMD(REPLY_3945_RX);
- IWL_CMD(REPLY_TX);
- IWL_CMD(REPLY_RATE_SCALE);
- IWL_CMD(REPLY_LEDS_CMD);
- IWL_CMD(REPLY_TX_LINK_QUALITY_CMD);
- IWL_CMD(REPLY_CHANNEL_SWITCH);
- IWL_CMD(CHANNEL_SWITCH_NOTIFICATION);
- IWL_CMD(REPLY_SPECTRUM_MEASUREMENT_CMD);
- IWL_CMD(SPECTRUM_MEASURE_NOTIFICATION);
- IWL_CMD(POWER_TABLE_CMD);
- IWL_CMD(PM_SLEEP_NOTIFICATION);
- IWL_CMD(PM_DEBUG_STATISTIC_NOTIFIC);
- IWL_CMD(REPLY_SCAN_CMD);
- IWL_CMD(REPLY_SCAN_ABORT_CMD);
- IWL_CMD(SCAN_START_NOTIFICATION);
- IWL_CMD(SCAN_RESULTS_NOTIFICATION);
- IWL_CMD(SCAN_COMPLETE_NOTIFICATION);
- IWL_CMD(BEACON_NOTIFICATION);
- IWL_CMD(REPLY_TX_BEACON);
- IWL_CMD(REPLY_TX_PWR_TABLE_CMD);
- IWL_CMD(REPLY_BT_CONFIG);
- IWL_CMD(REPLY_STATISTICS_CMD);
- IWL_CMD(STATISTICS_NOTIFICATION);
- IWL_CMD(CARD_STATE_NOTIFICATION);
- IWL_CMD(MISSED_BEACONS_NOTIFICATION);
- IWL_CMD(REPLY_CT_KILL_CONFIG_CMD);
- IWL_CMD(SENSITIVITY_CMD);
- IWL_CMD(REPLY_PHY_CALIBRATION_CMD);
- IWL_CMD(REPLY_RX_PHY_CMD);
- IWL_CMD(REPLY_RX_MPDU_CMD);
- IWL_CMD(REPLY_RX);
- IWL_CMD(REPLY_COMPRESSED_BA);
+ IL_CMD(REPLY_ALIVE);
+ IL_CMD(REPLY_ERROR);
+ IL_CMD(REPLY_RXON);
+ IL_CMD(REPLY_RXON_ASSOC);
+ IL_CMD(REPLY_QOS_PARAM);
+ IL_CMD(REPLY_RXON_TIMING);
+ IL_CMD(REPLY_ADD_STA);
+ IL_CMD(REPLY_REMOVE_STA);
+ IL_CMD(REPLY_WEPKEY);
+ IL_CMD(REPLY_3945_RX);
+ IL_CMD(REPLY_TX);
+ IL_CMD(REPLY_RATE_SCALE);
+ IL_CMD(REPLY_LEDS_CMD);
+ IL_CMD(REPLY_TX_LINK_QUALITY_CMD);
+ IL_CMD(REPLY_CHANNEL_SWITCH);
+ IL_CMD(CHANNEL_SWITCH_NOTIFICATION);
+ IL_CMD(REPLY_SPECTRUM_MEASUREMENT_CMD);
+ IL_CMD(SPECTRUM_MEASURE_NOTIFICATION);
+ IL_CMD(POWER_TABLE_CMD);
+ IL_CMD(PM_SLEEP_NOTIFICATION);
+ IL_CMD(PM_DEBUG_STATISTIC_NOTIFIC);
+ IL_CMD(REPLY_SCAN_CMD);
+ IL_CMD(REPLY_SCAN_ABORT_CMD);
+ IL_CMD(SCAN_START_NOTIFICATION);
+ IL_CMD(SCAN_RESULTS_NOTIFICATION);
+ IL_CMD(SCAN_COMPLETE_NOTIFICATION);
+ IL_CMD(BEACON_NOTIFICATION);
+ IL_CMD(REPLY_TX_BEACON);
+ IL_CMD(REPLY_TX_PWR_TABLE_CMD);
+ IL_CMD(REPLY_BT_CONFIG);
+ IL_CMD(REPLY_STATISTICS_CMD);
+ IL_CMD(STATISTICS_NOTIFICATION);
+ IL_CMD(CARD_STATE_NOTIFICATION);
+ IL_CMD(MISSED_BEACONS_NOTIFICATION);
+ IL_CMD(REPLY_CT_KILL_CONFIG_CMD);
+ IL_CMD(SENSITIVITY_CMD);
+ IL_CMD(REPLY_PHY_CALIBRATION_CMD);
+ IL_CMD(REPLY_RX_PHY_CMD);
+ IL_CMD(REPLY_RX_MPDU_CMD);
+ IL_CMD(REPLY_RX);
+ IL_CMD(REPLY_COMPRESSED_BA);
default:
return "UNKNOWN";
}
}
-EXPORT_SYMBOL(iwl_legacy_get_cmd_string);
+EXPORT_SYMBOL(il_get_cmd_string);
#define HOST_COMPLETE_TIMEOUT (HZ / 2)
-static void iwl_legacy_generic_cmd_callback(struct iwl_priv *priv,
- struct iwl_device_cmd *cmd,
- struct iwl_rx_packet *pkt)
+static void il_generic_cmd_callback(struct il_priv *priv,
+ struct il_device_cmd *cmd,
+ struct il_rx_packet *pkt)
{
- if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) {
- IWL_ERR(priv, "Bad return from %s (0x%08X)\n",
- iwl_legacy_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
+ if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {
+ IL_ERR(priv, "Bad return from %s (0x%08X)\n",
+ il_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
return;
}
@@ -104,18 +104,18 @@
switch (cmd->hdr.cmd) {
case REPLY_TX_LINK_QUALITY_CMD:
case SENSITIVITY_CMD:
- IWL_DEBUG_HC_DUMP(priv, "back from %s (0x%08X)\n",
- iwl_legacy_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
+ IL_DEBUG_HC_DUMP(priv, "back from %s (0x%08X)\n",
+ il_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
break;
default:
- IWL_DEBUG_HC(priv, "back from %s (0x%08X)\n",
- iwl_legacy_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
+ IL_DEBUG_HC(priv, "back from %s (0x%08X)\n",
+ il_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
}
#endif
}
static int
-iwl_legacy_send_cmd_async(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
+il_send_cmd_async(struct il_priv *priv, struct il_host_cmd *cmd)
{
int ret;
@@ -126,21 +126,21 @@
/* Assign a generic callback if one is not provided */
if (!cmd->callback)
- cmd->callback = iwl_legacy_generic_cmd_callback;
+ cmd->callback = il_generic_cmd_callback;
if (test_bit(STATUS_EXIT_PENDING, &priv->status))
return -EBUSY;
- ret = iwl_legacy_enqueue_hcmd(priv, cmd);
+ ret = il_enqueue_hcmd(priv, cmd);
if (ret < 0) {
- IWL_ERR(priv, "Error sending %s: enqueue_hcmd failed: %d\n",
- iwl_legacy_get_cmd_string(cmd->id), ret);
+ IL_ERR(priv, "Error sending %s: enqueue_hcmd failed: %d\n",
+ il_get_cmd_string(cmd->id), ret);
return ret;
}
return 0;
}
-int iwl_legacy_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
+int il_send_cmd_sync(struct il_priv *priv, struct il_host_cmd *cmd)
{
int cmd_idx;
int ret;
@@ -152,18 +152,18 @@
/* A synchronous command can not have a callback set. */
BUG_ON(cmd->callback);
- IWL_DEBUG_INFO(priv, "Attempting to send sync command %s\n",
- iwl_legacy_get_cmd_string(cmd->id));
+ IL_DEBUG_INFO(priv, "Attempting to send sync command %s\n",
+ il_get_cmd_string(cmd->id));
set_bit(STATUS_HCMD_ACTIVE, &priv->status);
- IWL_DEBUG_INFO(priv, "Setting HCMD_ACTIVE for command %s\n",
- iwl_legacy_get_cmd_string(cmd->id));
+ IL_DEBUG_INFO(priv, "Setting HCMD_ACTIVE for command %s\n",
+ il_get_cmd_string(cmd->id));
- cmd_idx = iwl_legacy_enqueue_hcmd(priv, cmd);
+ cmd_idx = il_enqueue_hcmd(priv, cmd);
if (cmd_idx < 0) {
ret = cmd_idx;
- IWL_ERR(priv, "Error sending %s: enqueue_hcmd failed: %d\n",
- iwl_legacy_get_cmd_string(cmd->id), ret);
+ IL_ERR(priv, "Error sending %s: enqueue_hcmd failed: %d\n",
+ il_get_cmd_string(cmd->id), ret);
goto out;
}
@@ -172,35 +172,35 @@
HOST_COMPLETE_TIMEOUT);
if (!ret) {
if (test_bit(STATUS_HCMD_ACTIVE, &priv->status)) {
- IWL_ERR(priv,
+ IL_ERR(priv,
"Error sending %s: time out after %dms.\n",
- iwl_legacy_get_cmd_string(cmd->id),
+ il_get_cmd_string(cmd->id),
jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
- IWL_DEBUG_INFO(priv,
+ IL_DEBUG_INFO(priv,
"Clearing HCMD_ACTIVE for command %s\n",
- iwl_legacy_get_cmd_string(cmd->id));
+ il_get_cmd_string(cmd->id));
ret = -ETIMEDOUT;
goto cancel;
}
}
if (test_bit(STATUS_RF_KILL_HW, &priv->status)) {
- IWL_ERR(priv, "Command %s aborted: RF KILL Switch\n",
- iwl_legacy_get_cmd_string(cmd->id));
+ IL_ERR(priv, "Command %s aborted: RF KILL Switch\n",
+ il_get_cmd_string(cmd->id));
ret = -ECANCELED;
goto fail;
}
if (test_bit(STATUS_FW_ERROR, &priv->status)) {
- IWL_ERR(priv, "Command %s failed: FW Error\n",
- iwl_legacy_get_cmd_string(cmd->id));
+ IL_ERR(priv, "Command %s failed: FW Error\n",
+ il_get_cmd_string(cmd->id));
ret = -EIO;
goto fail;
}
if ((cmd->flags & CMD_WANT_SKB) && !cmd->reply_page) {
- IWL_ERR(priv, "Error: Response NULL in '%s'\n",
- iwl_legacy_get_cmd_string(cmd->id));
+ IL_ERR(priv, "Error: Response NULL in '%s'\n",
+ il_get_cmd_string(cmd->id));
ret = -EIO;
goto cancel;
}
@@ -221,43 +221,43 @@
}
fail:
if (cmd->reply_page) {
- iwl_legacy_free_pages(priv, cmd->reply_page);
+ il_free_pages(priv, cmd->reply_page);
cmd->reply_page = 0;
}
out:
return ret;
}
-EXPORT_SYMBOL(iwl_legacy_send_cmd_sync);
+EXPORT_SYMBOL(il_send_cmd_sync);
-int iwl_legacy_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
+int il_send_cmd(struct il_priv *priv, struct il_host_cmd *cmd)
{
if (cmd->flags & CMD_ASYNC)
- return iwl_legacy_send_cmd_async(priv, cmd);
+ return il_send_cmd_async(priv, cmd);
- return iwl_legacy_send_cmd_sync(priv, cmd);
+ return il_send_cmd_sync(priv, cmd);
}
-EXPORT_SYMBOL(iwl_legacy_send_cmd);
+EXPORT_SYMBOL(il_send_cmd);
int
-iwl_legacy_send_cmd_pdu(struct iwl_priv *priv, u8 id, u16 len, const void *data)
+il_send_cmd_pdu(struct il_priv *priv, u8 id, u16 len, const void *data)
{
- struct iwl_host_cmd cmd = {
+ struct il_host_cmd cmd = {
.id = id,
.len = len,
.data = data,
};
- return iwl_legacy_send_cmd_sync(priv, &cmd);
+ return il_send_cmd_sync(priv, &cmd);
}
-EXPORT_SYMBOL(iwl_legacy_send_cmd_pdu);
+EXPORT_SYMBOL(il_send_cmd_pdu);
-int iwl_legacy_send_cmd_pdu_async(struct iwl_priv *priv,
+int il_send_cmd_pdu_async(struct il_priv *priv,
u8 id, u16 len, const void *data,
- void (*callback)(struct iwl_priv *priv,
- struct iwl_device_cmd *cmd,
- struct iwl_rx_packet *pkt))
+ void (*callback)(struct il_priv *priv,
+ struct il_device_cmd *cmd,
+ struct il_rx_packet *pkt))
{
- struct iwl_host_cmd cmd = {
+ struct il_host_cmd cmd = {
.id = id,
.len = len,
.data = data,
@@ -266,6 +266,6 @@
cmd.flags |= CMD_ASYNC;
cmd.callback = callback;
- return iwl_legacy_send_cmd_async(priv, &cmd);
+ return il_send_cmd_async(priv, &cmd);
}
-EXPORT_SYMBOL(iwl_legacy_send_cmd_pdu_async);
+EXPORT_SYMBOL(il_send_cmd_pdu_async);