Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98efb4a5 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlagn: make iwl_scan_cancel_timeout void 



The return value of iwl_scan_cancel_timeout()
isn't used anywhere, so let's just remove it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 02883562

drivers/net/wireless/iwlwifi/iwl-core.h

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force); 
 ******************************************************************************/

void iwl_init_scan_params(struct iwl_priv *priv);

int iwl_scan_cancel(struct iwl_priv *priv);

int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);

void iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);

void iwl_force_scan_end(struct iwl_priv *priv);

int iwl_mac_hw_scan(struct ieee80211_hw *hw,

		    struct ieee80211_vif *vif,

drivers/net/wireless/iwlwifi/iwl-scan.c

+1 −3
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ int iwl_scan_cancel(struct iwl_priv *priv) 
 * @ms: amount of time to wait (in milliseconds) for scan to abort

 *

 */

int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms)

void iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms)

{

	unsigned long timeout = jiffies + msecs_to_jiffies(ms);
@@ -184,8 +184,6 @@ int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms) 
			break;

		msleep(20);

	}



	return test_bit(STATUS_SCAN_HW, &priv->shrd->status);

}



/* Service response to REPLY_SCAN_CMD (0x80) */