diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-02-21 14:11:05 -0500 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-02-21 14:11:05 -0500 |
commit | 4bc85c1324aaa4a8bb0171e332ff762b6230bdfe (patch) | |
tree | 41345e49bdc3279325990e27b4d0d43bb97ed6cc /drivers/net/wireless/iwlwifi/iwl-eeprom.c | |
parent | aa833c4b1a928b8d3c4fcc2faaa0d6b81ea02b56 (diff) |
Revert "iwlwifi: split the drivers for agn and legacy devices 3945/4965"
This reverts commit aa833c4b1a928b8d3c4fcc2faaa0d6b81ea02b56.
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-eeprom.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c index 833194a2c639..358cfd7e5af1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c | |||
@@ -222,6 +222,7 @@ const u8 *iwlcore_eeprom_query_addr(const struct iwl_priv *priv, size_t offset) | |||
222 | BUG_ON(offset >= priv->cfg->base_params->eeprom_size); | 222 | BUG_ON(offset >= priv->cfg->base_params->eeprom_size); |
223 | return &priv->eeprom[offset]; | 223 | return &priv->eeprom[offset]; |
224 | } | 224 | } |
225 | EXPORT_SYMBOL(iwlcore_eeprom_query_addr); | ||
225 | 226 | ||
226 | static int iwl_init_otp_access(struct iwl_priv *priv) | 227 | static int iwl_init_otp_access(struct iwl_priv *priv) |
227 | { | 228 | { |
@@ -381,6 +382,7 @@ const u8 *iwl_eeprom_query_addr(const struct iwl_priv *priv, size_t offset) | |||
381 | { | 382 | { |
382 | return priv->cfg->ops->lib->eeprom_ops.query_addr(priv, offset); | 383 | return priv->cfg->ops->lib->eeprom_ops.query_addr(priv, offset); |
383 | } | 384 | } |
385 | EXPORT_SYMBOL(iwl_eeprom_query_addr); | ||
384 | 386 | ||
385 | u16 iwl_eeprom_query16(const struct iwl_priv *priv, size_t offset) | 387 | u16 iwl_eeprom_query16(const struct iwl_priv *priv, size_t offset) |
386 | { | 388 | { |
@@ -388,6 +390,7 @@ u16 iwl_eeprom_query16(const struct iwl_priv *priv, size_t offset) | |||
388 | return 0; | 390 | return 0; |
389 | return (u16)priv->eeprom[offset] | ((u16)priv->eeprom[offset + 1] << 8); | 391 | return (u16)priv->eeprom[offset] | ((u16)priv->eeprom[offset + 1] << 8); |
390 | } | 392 | } |
393 | EXPORT_SYMBOL(iwl_eeprom_query16); | ||
391 | 394 | ||
392 | /** | 395 | /** |
393 | * iwl_eeprom_init - read EEPROM contents | 396 | * iwl_eeprom_init - read EEPROM contents |
@@ -506,12 +509,14 @@ err: | |||
506 | alloc_err: | 509 | alloc_err: |
507 | return ret; | 510 | return ret; |
508 | } | 511 | } |
512 | EXPORT_SYMBOL(iwl_eeprom_init); | ||
509 | 513 | ||
510 | void iwl_eeprom_free(struct iwl_priv *priv) | 514 | void iwl_eeprom_free(struct iwl_priv *priv) |
511 | { | 515 | { |
512 | kfree(priv->eeprom); | 516 | kfree(priv->eeprom); |
513 | priv->eeprom = NULL; | 517 | priv->eeprom = NULL; |
514 | } | 518 | } |
519 | EXPORT_SYMBOL(iwl_eeprom_free); | ||
515 | 520 | ||
516 | static void iwl_init_band_reference(const struct iwl_priv *priv, | 521 | static void iwl_init_band_reference(const struct iwl_priv *priv, |
517 | int eep_band, int *eeprom_ch_count, | 522 | int eep_band, int *eeprom_ch_count, |
@@ -774,6 +779,7 @@ int iwl_init_channel_map(struct iwl_priv *priv) | |||
774 | 779 | ||
775 | return 0; | 780 | return 0; |
776 | } | 781 | } |
782 | EXPORT_SYMBOL(iwl_init_channel_map); | ||
777 | 783 | ||
778 | /* | 784 | /* |
779 | * iwl_free_channel_map - undo allocations in iwl_init_channel_map | 785 | * iwl_free_channel_map - undo allocations in iwl_init_channel_map |
@@ -783,6 +789,7 @@ void iwl_free_channel_map(struct iwl_priv *priv) | |||
783 | kfree(priv->channel_info); | 789 | kfree(priv->channel_info); |
784 | priv->channel_count = 0; | 790 | priv->channel_count = 0; |
785 | } | 791 | } |
792 | EXPORT_SYMBOL(iwl_free_channel_map); | ||
786 | 793 | ||
787 | /** | 794 | /** |
788 | * iwl_get_channel_info - Find driver's private channel info | 795 | * iwl_get_channel_info - Find driver's private channel info |
@@ -811,3 +818,4 @@ const struct iwl_channel_info *iwl_get_channel_info(const struct iwl_priv *priv, | |||
811 | 818 | ||
812 | return NULL; | 819 | return NULL; |
813 | } | 820 | } |
821 | EXPORT_SYMBOL(iwl_get_channel_info); | ||