iwlagn: store the irq number to iwl_bus just like dev

Since the irq number is just an unsigned int, store it inside iwl_bus
instead of calling the get_irq ops every time it is needed.

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 13828637385048fe1de64b39c22d3b3a7cbcadb7..1ac6c647535339db676872d10b0b0fa775a7a5e2 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3496,6 +3496,7 @@ int iwl_probe(void *bus_specific, struct iwl_bus_ops *bus_ops,
        priv->bus.priv = priv;
        priv->bus.bus_specific = bus_specific;
        priv->bus.ops = bus_ops;
+       priv->bus.irq = priv->bus.ops->get_irq(&priv->bus);
        priv->bus.ops->set_drv_data(&priv->bus, priv);
        priv->bus.dev = priv->bus.ops->get_dev(&priv->bus);
 
@@ -3603,11 +3604,10 @@ int iwl_probe(void *bus_specific, struct iwl_bus_ops *bus_ops,
         ********************/
        iwl_alloc_isr_ict(priv);
 
-       err = request_irq(priv->bus.ops->get_irq(&priv->bus), iwl_isr_ict,
-                         IRQF_SHARED, DRV_NAME, priv);
+       err = request_irq(priv->bus.irq, iwl_isr_ict, IRQF_SHARED,
+                         DRV_NAME, priv);
        if (err) {
-               IWL_ERR(priv, "Error allocating IRQ %d\n",
-                       priv->bus.ops->get_irq(&priv->bus));
+               IWL_ERR(priv, "Error allocating IRQ %d\n", priv->bus.irq);
                goto out_uninit_drv;
        }
 
@@ -3644,7 +3644,7 @@ int iwl_probe(void *bus_specific, struct iwl_bus_ops *bus_ops,
  out_destroy_workqueue:
        destroy_workqueue(priv->workqueue);
        priv->workqueue = NULL;
-       free_irq(priv->bus.ops->get_irq(&priv->bus), priv);
+       free_irq(priv->bus.irq, priv);
        iwl_free_isr_ict(priv);
  out_uninit_drv:
        iwl_uninit_drv(priv);
@@ -3716,7 +3716,7 @@ void __devexit iwl_remove(struct iwl_priv * priv)
        priv->workqueue = NULL;
        iwl_free_traffic_mem(priv);
 
-       free_irq(priv->bus.ops->get_irq(&priv->bus), priv);
+       free_irq(priv->bus.irq, priv);
        priv->bus.ops->set_drv_data(&priv->bus, NULL);
 
        iwl_uninit_drv(priv);

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h
index 848a6c3a56ad2a59f5c31e6ad5c1e7b316c2cf44..6d5584ae5ebff6b0ffd8e7d7bbd316fb91f23e69 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.h
@@ -125,7 +125,7 @@ irqreturn_t iwl_isr_ict(int irq, void *data);
 static inline void iwl_synchronize_irq(struct iwl_priv *priv)
 {
        /* wait to make sure we flush pending tasklet*/
-       synchronize_irq(priv->bus.ops->get_irq(&priv->bus));
+       synchronize_irq(priv->bus.irq);
        tasklet_kill(&priv->irq_tasklet);
 }
 

diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 2d13d8928e2c2c174db4e7f659abbfcbb8873348..8ec04f20c96aed61a553fcef62b2f1997b8142b8 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1224,6 +1224,7 @@ struct iwl_bus {
        struct iwl_priv *priv; /* driver's context */
        struct device *dev;
        struct iwl_bus_ops *ops;
+       unsigned int irq;
 };
 
 struct iwl_priv {