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

iwlwifi: remove un-needed parameter

Browse Source 
get rid of un-needed parameter

Change-Id: I992741e7382a3dbced7f8413bf1d5f301029d576
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Wey-Yi Guy
2012-03-15 13:26:42 -07:00
committed by John W. Linville
parent aa27a703ce
commit 88f10a176c
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/net/wireless/iwlwifi/iwl-agn.c
View File

@@ -1178,7 +1178,6 @@ static void iwl_debug_config(struct iwl_priv *priv)
static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
const struct iwl_fw *fw) const struct iwl_fw *fw)
{ {
int err = 0;
struct iwl_priv *priv; struct iwl_priv *priv;
struct ieee80211_hw *hw; struct ieee80211_hw *hw;
struct iwl_op_mode *op_mode; struct iwl_op_mode *op_mode;
@@ -1201,7 +1200,6 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
if (!hw) { if (!hw) {
pr_err("%s: Cannot allocate network device\n", pr_err("%s: Cannot allocate network device\n",
cfg(trans)->name); cfg(trans)->name);
err = -ENOMEM;
goto out; goto out;
} }
@@ -1273,26 +1271,24 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
IWL_INFO(priv, "Detected %s, REV=0x%X\n", IWL_INFO(priv, "Detected %s, REV=0x%X\n",
cfg(priv)->name, trans(priv)->hw_rev); cfg(priv)->name, trans(priv)->hw_rev);
err = iwl_trans_start_hw(trans(priv)); if (iwl_trans_start_hw(trans(priv)))
if (err)
goto out_free_traffic_mem; goto out_free_traffic_mem;
/***************** /*****************
* 3. Read EEPROM * 3. Read EEPROM
*****************/ *****************/
err = iwl_eeprom_init(trans(priv), trans(priv)->hw_rev); /* Read the EEPROM */
/* Reset chip to save power until we load uCode during "up". */ if (iwl_eeprom_init(trans(priv), trans(priv)->hw_rev)) {
iwl_trans_stop_hw(trans(priv));
if (err) {
IWL_ERR(priv, "Unable to init EEPROM\n"); IWL_ERR(priv, "Unable to init EEPROM\n");
goto out_free_traffic_mem; goto out_free_traffic_mem;
} }
err = iwl_eeprom_check_version(priv); /* Reset chip to save power until we load uCode during "up". */
if (err) iwl_trans_stop_hw(trans(priv));
if (iwl_eeprom_check_version(priv))
goto out_free_eeprom; goto out_free_eeprom;
err = iwl_eeprom_init_hw_params(priv); if (iwl_eeprom_init_hw_params(priv))
if (err)
goto out_free_eeprom; goto out_free_eeprom;
/* extract MAC Address */ /* extract MAC Address */
@@ -1332,9 +1328,9 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
* 5. Setup priv * 5. Setup priv
*******************/ *******************/
err = iwl_init_drv(priv); if (iwl_init_drv(priv))
if (err)
goto out_free_eeprom; goto out_free_eeprom;
/* At this point both hw and priv are initialized. */ /* At this point both hw and priv are initialized. */
/******************** /********************
@@ -1367,15 +1363,12 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
* *
* 7. Setup and register with mac80211 and debugfs * 7. Setup and register with mac80211 and debugfs
**************************************************/ **************************************************/
err = iwlagn_mac_setup_register(priv, &fw->ucode_capa); if (iwlagn_mac_setup_register(priv, &fw->ucode_capa))
if (err)
goto out_destroy_workqueue; goto out_destroy_workqueue;
err = iwl_dbgfs_register(priv, DRV_NAME); if (iwl_dbgfs_register(priv, DRV_NAME))
if (err)
IWL_ERR(priv, IWL_ERR(priv,
"failed to create debugfs files. Ignoring error: %d\n", "failed to create debugfs files. Ignoring error\n");
err);
return op_mode; return op_mode;