From ed1a962db760bfb5e30b8ab284873767790119b9 Mon Sep 17 00:00:00 2001 From: Luca Coelho Date: Tue, 26 Sep 2017 15:33:56 +0300 Subject: 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 --- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h') 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__ */ -- cgit v1.2.3 From 45f65569e0d968c5fd1e8c3c6d8983b402caaa27 Mon Sep 17 00:00:00 2001 From: Luca Coelho Date: Tue, 26 Sep 2017 16:31:10 +0300 Subject: iwlwifi: acpi: move function to get mcc into acpi code The iwl_get_bios_mcc() function was in the iwl-nvm-parse.c file, but it has nothing to do with the NVM. Move it to fw/acpi.c and rename it to iwl_acpi_get_mcc(). Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h') diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h index a39bd5c17c26..306736c7a042 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h @@ -109,14 +109,4 @@ 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); -/** - * iwl_get_bios_mcc - read MCC from BIOS, if available - * - * @dev: the struct device - * @mcc: output buffer (3 bytes) that will get the MCC - * - * This function tries to read the current MCC from ACPI if available. - */ -int iwl_get_bios_mcc(struct device *dev, char *mcc); - #endif /* __iwl_nvm_parse_h__ */ -- cgit v1.2.3