iwlwifi: remove useless goto
The patch removes some useless goto in code cleanup. Signed-off-by: Wu Fengguang <fengguang.wu@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:
Родитель
95aa194ac4
Коммит
febf3370c6
|
@ -426,7 +426,6 @@ static void iwl4965_nic_config(struct iwl_priv *priv)
|
|||
|
||||
static int iwl4965_apm_stop_master(struct iwl_priv *priv)
|
||||
{
|
||||
int ret = 0;
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&priv->lock, flags);
|
||||
|
@ -434,16 +433,13 @@ static int iwl4965_apm_stop_master(struct iwl_priv *priv)
|
|||
/* set stop master bit */
|
||||
iwl_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);
|
||||
|
||||
ret = iwl_poll_direct_bit(priv, CSR_RESET,
|
||||
iwl_poll_direct_bit(priv, CSR_RESET,
|
||||
CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
out:
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
IWL_DEBUG_INFO("stop master\n");
|
||||
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void iwl4965_apm_stop(struct iwl_priv *priv)
|
||||
|
|
|
@ -73,7 +73,6 @@ static const u16 iwl5000_default_queue_to_tx_fifo[] = {
|
|||
/* FIXME: same implementation as 4965 */
|
||||
static int iwl5000_apm_stop_master(struct iwl_priv *priv)
|
||||
{
|
||||
int ret = 0;
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&priv->lock, flags);
|
||||
|
@ -81,16 +80,13 @@ static int iwl5000_apm_stop_master(struct iwl_priv *priv)
|
|||
/* set stop master bit */
|
||||
iwl_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);
|
||||
|
||||
ret = iwl_poll_direct_bit(priv, CSR_RESET,
|
||||
iwl_poll_direct_bit(priv, CSR_RESET,
|
||||
CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
out:
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
IWL_DEBUG_INFO("stop master\n");
|
||||
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче