diff options
| author | Don Fry <donald.h.fry@intel.com> | 2011-07-08 08:46:29 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-11 15:02:10 -0400 |
| commit | 5c3d29fc0d083e674c09407f1bc78e9dbf4ae8a5 (patch) | |
| tree | aacef653a991d96398cbbfce5524375b17dac611 /drivers/net/wireless/iwlwifi/iwl-scan.c | |
| parent | 4e308119771573f949203f9f4732bcbfb9628279 (diff) | |
| download | linux-5c3d29fc0d083e674c09407f1bc78e9dbf4ae8a5.tar.gz linux-5c3d29fc0d083e674c09407f1bc78e9dbf4ae8a5.tar.bz2 linux-5c3d29fc0d083e674c09407f1bc78e9dbf4ae8a5.zip | |
iwlagn: remove iwlagn_hcmd_utils structure and call directly
Not needed since the driver split. Move single use routines to
calling location and keep static where possible.
Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 077d023ab7ea..f6ebe29eb790 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -350,9 +350,6 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv, lockdep_assert_held(&priv->mutex); - if (WARN_ON(!priv->cfg->ops->utils->request_scan)) - return -EOPNOTSUPP; - cancel_delayed_work(&priv->scan_check); if (!iwl_is_ready_rf(priv)) { @@ -381,7 +378,7 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv, priv->scan_start = jiffies; priv->scan_band = band; - ret = priv->cfg->ops->utils->request_scan(priv, vif); + ret = iwlagn_request_scan(priv, vif); if (ret) { clear_bit(STATUS_SCANNING, &priv->status); priv->scan_type = IWL_SCAN_NORMAL; |