diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-02-13 10:23:16 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-22 19:51:13 (GMT) |
| commit | a89268e8cdcd52680bda21ada05f2716c6466377 (patch) | |
| tree | bd8ead31aa28ccb0e193c03535915185bdbf27ea /drivers/net/wireless/iwlegacy/common.h | |
| parent | 527901d0aeb233a479123b7e5f542fbc911ccf6d (diff) | |
| download | linux-a89268e8cdcd52680bda21ada05f2716c6466377.tar.xz | |
iwlegacy: merge eeprom_ops into lib_ops
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/common.h')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/common.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h index 6f42f56..b588a5f 100644 --- a/drivers/net/wireless/iwlegacy/common.h +++ b/drivers/net/wireless/iwlegacy/common.h @@ -425,11 +425,6 @@ struct il_eeprom_calib_info { #define EEPROM_REGULATORY_BAND_NO_HT40 (0) -struct il_eeprom_ops { - int (*acquire_semaphore) (struct il_priv *il); - void (*release_semaphore) (struct il_priv *il); -}; - int il_eeprom_init(struct il_priv *il); void il_eeprom_free(struct il_priv *il); const u8 *il_eeprom_query_addr(const struct il_priv *il, size_t offset); @@ -1617,7 +1612,8 @@ struct il_lib_ops { void (*update_chain_flags) (struct il_priv *il); /* eeprom operations */ - struct il_eeprom_ops eeprom_ops; + int (*eeprom_acquire_semaphore) (struct il_priv *il); + void (*eeprom_release_semaphore) (struct il_priv *il); }; struct il_led_ops { |