iwlagn: add a get_irq method to iwl_bus_ops and use it
In order to remove a few more dereference to priv->pdev that will be killed
[Asoon, there is now a method to get the IRQ number.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 1ff8e4b..e2b319f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3610,10 +3610,11 @@
********************/
iwl_alloc_isr_ict(priv);
- err = request_irq(priv->pci_dev->irq, iwl_isr_ict,
+ err = request_irq(priv->bus.ops->get_irq(&priv->bus), iwl_isr_ict,
IRQF_SHARED, DRV_NAME, priv);
if (err) {
- IWL_ERR(priv, "Error allocating IRQ %d\n", priv->pci_dev->irq);
+ IWL_ERR(priv, "Error allocating IRQ %d\n",
+ priv->bus.ops->get_irq(&priv->bus));
goto out_uninit_drv;
}
@@ -3650,7 +3651,7 @@
out_destroy_workqueue:
destroy_workqueue(priv->workqueue);
priv->workqueue = NULL;
- free_irq(priv->pci_dev->irq, priv);
+ free_irq(priv->bus.ops->get_irq(&priv->bus), priv);
iwl_free_isr_ict(priv);
out_uninit_drv:
iwl_uninit_drv(priv);
@@ -3722,7 +3723,7 @@
priv->workqueue = NULL;
iwl_free_traffic_mem(priv);
- free_irq(priv->pci_dev->irq, priv);
+ free_irq(priv->bus.ops->get_irq(&priv->bus), priv);
priv->bus.ops->set_drv_data(&priv->bus, NULL);
iwl_uninit_drv(priv);