Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 519d8abd authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlagn: remove ISR ops 



The ISR (interrupt service routine) ops are now
no longer necessary since they are the same for
all devices this driver now handles.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0e588445

drivers/net/wireless/iwlwifi/iwl-1000.c

+0 −7
Original line number Diff line number Diff line
@@ -209,13 +209,6 @@ static struct iwl_lib_ops iwl1000_lib = { 
		.calib_version	= iwlagn_eeprom_calib_version,

		.query_addr = iwlagn_eeprom_query_addr,

	},

	.isr_ops = {

		.isr = iwl_isr_ict,

		.free = iwl_free_isr_ict,

		.alloc = iwl_alloc_isr_ict,

		.reset = iwl_reset_ict,

		.disable = iwl_disable_ict,

	},

	.temp_ops = {

		.temperature = iwlagn_temperature,

	 },

drivers/net/wireless/iwlwifi/iwl-2000.c

+0 −7
Original line number Diff line number Diff line
@@ -292,13 +292,6 @@ static struct iwl_lib_ops iwl2000_lib = { 
		.query_addr = iwlagn_eeprom_query_addr,

		.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,

	},

	.isr_ops = {

		.isr = iwl_isr_ict,

		.free = iwl_free_isr_ict,

		.alloc = iwl_alloc_isr_ict,

		.reset = iwl_reset_ict,

		.disable = iwl_disable_ict,

	},

	.temp_ops = {

		.temperature = iwlagn_temperature,

	},

drivers/net/wireless/iwlwifi/iwl-5000.c

+0 −14
Original line number Diff line number Diff line
@@ -378,13 +378,6 @@ static struct iwl_lib_ops iwl5000_lib = { 
		.calib_version	= iwlagn_eeprom_calib_version,

		.query_addr = iwlagn_eeprom_query_addr,

	},

	.isr_ops = {

		.isr = iwl_isr_ict,

		.free = iwl_free_isr_ict,

		.alloc = iwl_alloc_isr_ict,

		.reset = iwl_reset_ict,

		.disable = iwl_disable_ict,

	},

	.temp_ops = {

		.temperature = iwlagn_temperature,

	 },
@@ -440,13 +433,6 @@ static struct iwl_lib_ops iwl5150_lib = { 
		.calib_version	= iwlagn_eeprom_calib_version,

		.query_addr = iwlagn_eeprom_query_addr,

	},

	.isr_ops = {

		.isr = iwl_isr_ict,

		.free = iwl_free_isr_ict,

		.alloc = iwl_alloc_isr_ict,

		.reset = iwl_reset_ict,

		.disable = iwl_disable_ict,

	},

	.temp_ops = {

		.temperature = iwl5150_temperature,

	 },

drivers/net/wireless/iwlwifi/iwl-6000.c

+0 −14
Original line number Diff line number Diff line
@@ -320,13 +320,6 @@ static struct iwl_lib_ops iwl6000_lib = { 
		.query_addr = iwlagn_eeprom_query_addr,

		.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,

	},

	.isr_ops = {

		.isr = iwl_isr_ict,

		.free = iwl_free_isr_ict,

		.alloc = iwl_alloc_isr_ict,

		.reset = iwl_reset_ict,

		.disable = iwl_disable_ict,

	},

	.temp_ops = {

		.temperature = iwlagn_temperature,

	 },
@@ -385,13 +378,6 @@ static struct iwl_lib_ops iwl6030_lib = { 
		.query_addr = iwlagn_eeprom_query_addr,

		.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,

	},

	.isr_ops = {

		.isr = iwl_isr_ict,

		.free = iwl_free_isr_ict,

		.alloc = iwl_alloc_isr_ict,

		.reset = iwl_reset_ict,

		.disable = iwl_disable_ict,

	},

	.temp_ops = {

		.temperature = iwlagn_temperature,

	 },

drivers/net/wireless/iwlwifi/iwl-agn.c

+6 −11
Original line number Diff line number Diff line
@@ -2397,8 +2397,7 @@ static void __iwl_down(struct iwl_priv *priv) 
				STATUS_EXIT_PENDING;



	/* device going down, Stop using ICT table */

	if (priv->cfg->ops->lib->isr_ops.disable)

		priv->cfg->ops->lib->isr_ops.disable(priv);

	iwl_disable_ict(priv);



	iwlagn_txq_ctx_stop(priv);

	iwlagn_rxq_stop(priv);
@@ -2606,8 +2605,7 @@ static void iwl_bg_alive_start(struct work_struct *data) 
		goto unlock;



	/* enable dram interrupt */

	if (priv->cfg->ops->lib->isr_ops.reset)

		priv->cfg->ops->lib->isr_ops.reset(priv);

	iwl_reset_ict(priv);



	iwl_alive_start(priv);

unlock:
@@ -3958,10 +3956,9 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	pci_enable_msi(priv->pci_dev);



	if (priv->cfg->ops->lib->isr_ops.alloc)

		priv->cfg->ops->lib->isr_ops.alloc(priv);

	iwl_alloc_isr_ict(priv);



	err = request_irq(priv->pci_dev->irq, priv->cfg->ops->lib->isr_ops.isr,

	err = request_irq(priv->pci_dev->irq, iwl_isr_ict,

			  IRQF_SHARED, DRV_NAME, priv);

	if (err) {

		IWL_ERR(priv, "Error allocating IRQ %d\n", priv->pci_dev->irq);
@@ -4008,8 +4005,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	destroy_workqueue(priv->workqueue);

	priv->workqueue = NULL;

	free_irq(priv->pci_dev->irq, priv);

	if (priv->cfg->ops->lib->isr_ops.free)

		priv->cfg->ops->lib->isr_ops.free(priv);

	iwl_free_isr_ict(priv);

 out_disable_msi:

	pci_disable_msi(priv->pci_dev);

	iwl_uninit_drv(priv);
@@ -4107,8 +4103,7 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev) 


	iwl_uninit_drv(priv);



	if (priv->cfg->ops->lib->isr_ops.free)

		priv->cfg->ops->lib->isr_ops.free(priv);

	iwl_free_isr_ict(priv);



	dev_kfree_skb(priv->beacon_skb);