diff options
author | Luca Coelho <luciano.coelho@intel.com> | 2017-09-26 16:31:10 +0300 |
---|---|---|
committer | Luca Coelho <luciano.coelho@intel.com> | 2017-10-06 15:22:32 +0300 |
commit | 45f65569e0d968c5fd1e8c3c6d8983b402caaa27 (patch) | |
tree | 6c19dc3e758022fe92d082515b857677b3bbc4e3 /drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | |
parent | d953cdb8ee1ba94f3e64751fe4740c82d09cffa8 (diff) | |
download | linux-45f65569e0d968c5fd1e8c3c6d8983b402caaa27.tar.xz |
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 <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c')
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c index d98318f93b9e..d9a2ea9dd93f 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c @@ -944,37 +944,3 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, return regd; } IWL_EXPORT_SYMBOL(iwl_parse_nvm_mcc_info); - -int iwl_get_bios_mcc(struct device *dev, char *mcc) -{ - union acpi_object *wifi_pkg, *data; - u32 mcc_val; - int ret; - - data = iwl_acpi_get_object(dev, ACPI_WRDD_METHOD); - if (IS_ERR(data)) - return PTR_ERR(data); - - wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE); - if (IS_ERR(wifi_pkg)) { - ret = PTR_ERR(wifi_pkg); - goto out_free; - } - - if (wifi_pkg->package.elements[1].type != ACPI_TYPE_INTEGER) { - ret = -EINVAL; - goto out_free; - } - - mcc_val = wifi_pkg->package.elements[1].integer.value; - - mcc[0] = (mcc_val >> 8) & 0xff; - mcc[1] = mcc_val & 0xff; - mcc[2] = '\0'; - - ret = 0; -out_free: - kfree(data); - return ret; -} -IWL_EXPORT_SYMBOL(iwl_get_bios_mcc); |