diff options
| author | Luca Coelho <luciano.coelho@intel.com> | 2017-09-26 15:33:56 +0300 |
|---|---|---|
| committer | Luca Coelho <luciano.coelho@intel.com> | 2017-10-06 15:22:31 +0300 |
| commit | ed1a962db760bfb5e30b8ab284873767790119b9 (patch) | |
| tree | 59abcb47dc3b745896369cec6051e4fb158acc92 /drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | |
| parent | 45a5c6f68b2649ccb71721b95be22720f04b2bc3 (diff) | |
| download | linux-ed1a962db760bfb5e30b8ab284873767790119b9.tar.xz | |
iwlwifi: acpi: make iwl_get_bios_mcc() use the common acpi functions
The way iwl_get_bios_mcc() gets the WiFi package and checks for its
integrity is almost identical to the new iwl_acpi_get_wifi_pkg()
function. Instead of having duplicate code, convert it to use the
common code.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h index 2d1a24dd8410..a39bd5c17c26 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h @@ -109,7 +109,6 @@ struct ieee80211_regdomain * iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, int num_of_ch, __le32 *channels, u16 fw_mcc); -#ifdef CONFIG_ACPI /** * iwl_get_bios_mcc - read MCC from BIOS, if available * @@ -119,11 +118,5 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, * This function tries to read the current MCC from ACPI if available. */ int iwl_get_bios_mcc(struct device *dev, char *mcc); -#else -static inline int iwl_get_bios_mcc(struct device *dev, char *mcc) -{ - return -ENOENT; -} -#endif #endif /* __iwl_nvm_parse_h__ */ |