Commit f03ee2a8 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlegacy: remove il_apm_ops 



Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a89268e8

drivers/net/wireless/iwlegacy/3945-mac.c

+1 −1
Original line number Diff line number Diff line
@@ -3672,7 +3672,7 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 * PCI Tx retries from interfering with C3 CPU state */

	pci_write_config_byte(pdev, 0x41, 0x00);



	/* these spin locks will be used in apm_ops.init and EEPROM access

	/* these spin locks will be used in apm_init and EEPROM access

	 * we should init now

	 */

	spin_lock_init(&il->reg_lock);

drivers/net/wireless/iwlegacy/3945.c

+3 −7
Original line number Diff line number Diff line
@@ -958,12 +958,11 @@ il3945_hw_nic_init(struct il_priv *il) 
	struct il_rx_queue *rxq = &il->rxq;



	spin_lock_irqsave(&il->lock, flags);

	il->ops->lib->apm_ops.init(il);

	il3945_apm_init(il);

	spin_unlock_irqrestore(&il->lock, flags);



	il3945_set_pwr_vmain(il);



	il->ops->lib->apm_ops.config(il);

	il3945_nic_config(il);



	/* Allocate the RX queue, or reset if it is already allocated */

	if (!rxq->bd) {
@@ -2641,10 +2640,7 @@ static struct il_lib_ops il3945_lib = { 
	.txq_init = il3945_hw_tx_queue_init,

	.load_ucode = il3945_load_bsm,

	.dump_nic_error_log = il3945_dump_nic_error_log,

	.apm_ops = {

		    .init = il3945_apm_init,

		    .config = il3945_nic_config,

		    },

	.apm_init = il3945_apm_init,

	.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,

drivers/net/wireless/iwlegacy/4965-mac.c

+2 −6
Original line number Diff line number Diff line
@@ -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) {

drivers/net/wireless/iwlegacy/4965.c

+2 −5
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ iw4965_is_ht40_channel(__le32 rxon_flags) 
		chan_mod == CHANNEL_MODE_MIXED);

}



static void

void

il4965_nic_config(struct il_priv *il)

{

	unsigned long flags;
@@ -1900,10 +1900,7 @@ static struct il_lib_ops il4965_lib = { 
	.dump_nic_error_log = il4965_dump_nic_error_log,

	.dump_fh = il4965_dump_fh,

	.set_channel_switch = il4965_hw_channel_switch,

	.apm_ops = {

		    .init = il_apm_init,

		    .config = il4965_nic_config,

		    },

	.apm_init = il_apm_init,

	.send_tx_power = il4965_send_tx_power,

	.update_chain_flags = il4965_update_chain_flags,

	.eeprom_acquire_semaphore = il4965_eeprom_acquire_semaphore,

drivers/net/wireless/iwlegacy/4965.h

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ int il4965_rx_init(struct il_priv *il, struct il_rx_queue *rxq); 
int il4965_hw_nic_init(struct il_priv *il);

int il4965_dump_fh(struct il_priv *il, char **buf, bool display);



void il4965_nic_config(struct il_priv *il);



/* rx */

void il4965_rx_queue_restock(struct il_priv *il);

void il4965_rx_replenish(struct il_priv *il);