diff options
| author | Stanislaw Gruszka | 2012-02-13 11:23:17 +0100 |
|---|---|---|
| committer | John W. Linville | 2012-02-22 20:51:14 +0100 |
| commit | f03ee2a87e21f76928c10d822639ec437113d312 (patch) | |
| tree | 002cee0f71786f88ce3d859abe2fc6c1304745c1 /drivers/net/wireless/iwlegacy/4965-mac.c | |
| parent | iwlegacy: merge eeprom_ops into lib_ops (diff) | |
| download | kernel-qcow2-linux-f03ee2a87e21f76928c10d822639ec437113d312.tar.gz kernel-qcow2-linux-f03ee2a87e21f76928c10d822639ec437113d312.tar.xz kernel-qcow2-linux-f03ee2a87e21f76928c10d822639ec437113d312.zip | |
iwlegacy: remove il_apm_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/4965-mac.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index e113dc5b1c2e..ebfcfc8a9ae6 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c @@ -199,18 +199,14 @@ il4965_hw_nic_init(struct il_priv *il) struct il_rx_queue *rxq = &il->rxq; int ret; - /* nic_init */ spin_lock_irqsave(&il->lock, flags); - il->ops->lib->apm_ops.init(il); - + il_apm_init(il); /* Set interrupt coalescing calibration timer to default (512 usecs) */ il_write8(il, CSR_INT_COALESCING, IL_HOST_INT_CALIB_TIMEOUT_DEF); - spin_unlock_irqrestore(&il->lock, flags); il4965_set_pwr_vmain(il); - - il->ops->lib->apm_ops.config(il); + il4965_nic_config(il); /* Allocate the RX queue, or reset if it is already allocated */ if (!rxq->bd) { |