AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-01 08:46:43 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

iwlegacy: small il4965_set_hw_ready cleanup

Browse Source 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Stanislaw Gruszka 2012-02-13 11:23:26 +01:00 committed by John W. Linville
parent 586e45e31e
commit 71e0c6c267
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/net/wireless/iwlegacy/4965-mac.c
View File

@ -5446,40 +5446,36 @@ il4965_down(struct il_priv *il)
il4965_cancel_deferred_work(il);
}
#define HW_READY_TIMEOUT (50)
static int
static void
il4965_set_hw_ready(struct il_priv *il)
{
int ret = 0;
int ret;
il_set_bit(il, CSR_HW_IF_CONFIG_REG,
CSR_HW_IF_CONFIG_REG_BIT_NIC_READY);
/* See if we got it */
ret =
_il_poll_bit(il, CSR_HW_IF_CONFIG_REG,
CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
CSR_HW_IF_CONFIG_REG_BIT_NIC_READY, HW_READY_TIMEOUT);
if (ret != -ETIMEDOUT)
ret = _il_poll_bit(il, CSR_HW_IF_CONFIG_REG,
CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
100);
if (ret >= 0)
il->hw_ready = true;
else
il->hw_ready = false;
D_INFO("hardware %s\n", (il->hw_ready == 1) ? "ready" : "not ready");
return ret;
D_INFO("hardware %s ready\n", (il->hw_ready) ? "" : "not");
}
static int
static void
il4965_prepare_card_hw(struct il_priv *il)
{
int ret = 0;
int ret;
D_INFO("il4965_prepare_card_hw enter\n");
il->hw_ready = false;
ret = il4965_set_hw_ready(il);
il4965_set_hw_ready(il);
if (il->hw_ready)
return ret;
return;
/* If HW is not ready, prepare the conditions to check again */
il_set_bit(il, CSR_HW_IF_CONFIG_REG, CSR_HW_IF_CONFIG_REG_PREPARE);
@ -5492,8 +5488,6 @@ il4965_prepare_card_hw(struct il_priv *il)
/* HW should be ready by now, check again. */
if (ret != -ETIMEDOUT)
il4965_set_hw_ready(il);
return ret;
}
#define MAX_HW_RESTARTS 5
@ -5521,9 +5515,8 @@ __il4965_up(struct il_priv *il)
}
il4965_prepare_card_hw(il);
if (!il->hw_ready) {
IL_WARN("Exit HW not ready\n");
IL_ERR("HW not ready\n");
return -EIO;
}