diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-02-13 11:17:57 +0200 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-02-27 13:27:27 -0800 |
| commit | 90304749c366c0eb5b8d01d415ee95e9215e0dbf (patch) | |
| tree | 742b5e3a99fe3f0cda8afefe59e3e093e14b8579 | |
| parent | ff6e75cb20b6423c8947077a377ba318dd1a7554 (diff) | |
| download | op-kernel-dev-90304749c366c0eb5b8d01d415ee95e9215e0dbf.zip op-kernel-dev-90304749c366c0eb5b8d01d415ee95e9215e0dbf.tar.gz | |
iwlwifi: move eeprom defines to iwl-eeprom.c
They don't need to be in iwl-dev.h
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 479d328..a670c82 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -443,9 +443,6 @@ struct iwl_chain_noise_data { u8 state; }; -#define EEPROM_SEM_TIMEOUT 10 /* milliseconds */ -#define EEPROM_SEM_RETRY_LIMIT 1000 /* number of attempts (not time) */ - enum { MEASUREMENT_READY = (1 << 0), MEASUREMENT_ACTIVE = (1 << 1), diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c index d1fd1cd..5936833 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c @@ -149,6 +149,10 @@ static const u8 iwl_eeprom_band_7[] = { /* 5.2 ht40 channel */ * EEPROM chip, not a single event, so even reads could conflict if they * weren't arbitrated by the semaphore. */ + +#define EEPROM_SEM_TIMEOUT 10 /* milliseconds */ +#define EEPROM_SEM_RETRY_LIMIT 1000 /* number of attempts (not time) */ + static int iwl_eeprom_acquire_semaphore(struct iwl_bus *bus) { u16 count; |
