lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwl3945: switch to the iwl-core send_card_state routine

Browse Source 
Switch iwl3945 to use iwl-core:send_card_state routine.

Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Samuel Ortiz
2008-12-22 11:31:18 +08:00
committed by John W. Linville
parent 188cf6c73a
commit c496294efe
3 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/iwlwifi/iwl-core.c
View File

@@ -1368,7 +1368,7 @@ EXPORT_SYMBOL(iwl_rf_kill_ct_config);
* When in the 'halt' state, the card is shut down and must be fully * When in the 'halt' state, the card is shut down and must be fully
* restarted to come back on. * restarted to come back on.
*/ */
static int iwl_send_card_state(struct iwl_priv *priv, u32 flags, u8 meta_flag) int iwl_send_card_state(struct iwl_priv *priv, u32 flags, u8 meta_flag)
{ {
struct iwl_host_cmd cmd = { struct iwl_host_cmd cmd = {
.id = REPLY_CARD_STATE_CMD, .id = REPLY_CARD_STATE_CMD,
@@ -1379,6 +1379,7 @@ static int iwl_send_card_state(struct iwl_priv *priv, u32 flags, u8 meta_flag)
return iwl_send_cmd(priv, &cmd); return iwl_send_cmd(priv, &cmd);
} }
EXPORT_SYMBOL(iwl_send_card_state);
void iwl_radio_kill_sw_disable_radio(struct iwl_priv *priv) void iwl_radio_kill_sw_disable_radio(struct iwl_priv *priv)
{ {

3
drivers/net/wireless/iwlwifi/iwl-core.h
View File

@@ -342,6 +342,9 @@ int iwl_send_cmd_pdu_async(struct iwl_priv *priv, u8 id, u16 len,
int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd); int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd);
int iwl_send_card_state(struct iwl_priv *priv, u32 flags,
u8 meta_flag);
/***************************************************** /*****************************************************
* PCI * * PCI *
*****************************************************/ *****************************************************/

34
drivers/net/wireless/iwlwifi/iwl3945-base.c
View File

@@ -1076,38 +1076,6 @@ static int iwl3945_send_scan_abort(struct iwl_priv *priv)
return rc; return rc;
} }
static int iwl3945_card_state_sync_callback(struct iwl_priv *priv,
struct iwl_cmd *cmd,
struct sk_buff *skb)
{
return 1;
}
/*
* CARD_STATE_CMD
*
* Use: Sets the device's internal card state to enable, disable, or halt
*
* When in the 'enable' state the card operates as normal.
* When in the 'disable' state, the card enters into a low power mode.
* When in the 'halt' state, the card is shut down and must be fully
* restarted to come back on.
*/
static int iwl3945_send_card_state(struct iwl_priv *priv, u32 flags, u8 meta_flag)
{
struct iwl_host_cmd cmd = {
.id = REPLY_CARD_STATE_CMD,
.len = sizeof(u32),
.data = &flags,
.meta.flags = meta_flag,
};
if (meta_flag & CMD_ASYNC)
cmd.meta.u.callback = iwl3945_card_state_sync_callback;
return iwl3945_send_cmd(priv, &cmd);
}
static int iwl3945_add_sta_sync_callback(struct iwl_priv *priv, static int iwl3945_add_sta_sync_callback(struct iwl_priv *priv,
struct iwl_cmd *cmd, struct sk_buff *skb) struct iwl_cmd *cmd, struct sk_buff *skb)
{ {
@@ -2545,7 +2513,7 @@ static void iwl3945_radio_kill_sw(struct iwl_priv *priv, int disable_radio)
iwl_write32(priv, CSR_UCODE_DRV_GP1_SET, iwl_write32(priv, CSR_UCODE_DRV_GP1_SET,
CSR_UCODE_SW_BIT_RFKILL); CSR_UCODE_SW_BIT_RFKILL);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
iwl3945_send_card_state(priv, CARD_STATE_CMD_DISABLE, 0); iwl_send_card_state(priv, CARD_STATE_CMD_DISABLE, 0);
set_bit(STATUS_RF_KILL_SW, &priv->status); set_bit(STATUS_RF_KILL_SW, &priv->status);
} }
return; return;