iwlegacy: merge eeprom_ops into lib_ops
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
527901d0ae
commit
a89268e8cd
|
@ -2645,12 +2645,10 @@ static struct il_lib_ops il3945_lib = {
|
|||
.init = il3945_apm_init,
|
||||
.config = il3945_nic_config,
|
||||
},
|
||||
.eeprom_ops = {
|
||||
.acquire_semaphore = il3945_eeprom_acquire_semaphore,
|
||||
.release_semaphore = il3945_eeprom_release_semaphore,
|
||||
},
|
||||
.send_tx_power = il3945_send_tx_power,
|
||||
.is_valid_rtc_data_addr = il3945_hw_valid_rtc_data_addr,
|
||||
.eeprom_acquire_semaphore = il3945_eeprom_acquire_semaphore,
|
||||
.eeprom_release_semaphore = il3945_eeprom_release_semaphore,
|
||||
};
|
||||
|
||||
static const struct il_legacy_ops il3945_legacy_ops = {
|
||||
|
|
|
@ -1904,12 +1904,10 @@ static struct il_lib_ops il4965_lib = {
|
|||
.init = il_apm_init,
|
||||
.config = il4965_nic_config,
|
||||
},
|
||||
.eeprom_ops = {
|
||||
.acquire_semaphore = il4965_eeprom_acquire_semaphore,
|
||||
.release_semaphore = il4965_eeprom_release_semaphore,
|
||||
},
|
||||
.send_tx_power = il4965_send_tx_power,
|
||||
.update_chain_flags = il4965_update_chain_flags,
|
||||
.eeprom_acquire_semaphore = il4965_eeprom_acquire_semaphore,
|
||||
.eeprom_release_semaphore = il4965_eeprom_release_semaphore,
|
||||
};
|
||||
|
||||
static const struct il_legacy_ops il4965_legacy_ops = {
|
||||
|
|
|
@ -740,7 +740,7 @@ il_eeprom_init(struct il_priv *il)
|
|||
}
|
||||
|
||||
/* Make sure driver (instead of uCode) is allowed to read EEPROM */
|
||||
ret = il->ops->lib->eeprom_ops.acquire_semaphore(il);
|
||||
ret = il->ops->lib->eeprom_acquire_semaphore(il);
|
||||
if (ret < 0) {
|
||||
IL_ERR("Failed to acquire EEPROM semaphore.\n");
|
||||
ret = -ENOENT;
|
||||
|
@ -772,7 +772,7 @@ il_eeprom_init(struct il_priv *il)
|
|||
|
||||
ret = 0;
|
||||
done:
|
||||
il->ops->lib->eeprom_ops.release_semaphore(il);
|
||||
il->ops->lib->eeprom_release_semaphore(il);
|
||||
|
||||
err:
|
||||
if (ret)
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue