On Fri, 2010-09-10 at 07:26 -0700, Stanislaw Gruszka wrote:
> Remove redundant checks and use iwl_is_ready_rf().
>
> Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Acked-by: Wey-Yi W Guy <wey-yi.w.guy@xxxxxxxxx>
> ---
> drivers/net/wireless/iwlwifi/iwl-scan.c | 17 +----------------
> 1 files changed, 1 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
> index af9a836..26dd8f3 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-scan.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
> @@ -361,7 +361,7 @@ static int __must_check iwl_scan_initiate(struct iwl_priv *priv,
>
> cancel_delayed_work(&priv->scan_check);
>
> - if (!iwl_is_ready(priv)) {
> + if (!iwl_is_ready_rf(priv)) {
> IWL_WARN(priv, "request scan called when driver not ready.\n");
> return -EIO;
> }
> @@ -372,26 +372,11 @@ static int __must_check iwl_scan_initiate(struct iwl_priv *priv,
> return -EBUSY;
> }
>
> - if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
> - IWL_DEBUG_SCAN(priv, "Aborting scan due to device shutdown\n");
> - return -EIO;
> - }
> -
> if (test_bit(STATUS_SCAN_ABORTING, &priv->status)) {
> IWL_DEBUG_HC(priv, "Scan request while abort pending.\n");
> return -EBUSY;
> }
>
> - if (iwl_is_rfkill(priv)) {
> - IWL_DEBUG_HC(priv, "Aborting scan due to RF Kill activation\n");
> - return -EIO;
> - }
> -
> - if (!test_bit(STATUS_READY, &priv->status)) {
> - IWL_DEBUG_HC(priv, "Scan request while uninitialized.\n");
> - return -EBUSY;
> - }
> -
> IWL_DEBUG_INFO(priv, "Starting %sscan...\n",
> internal ? "internal short " : "");
>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
