Commit 705cd451 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

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: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 4b55b07f

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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

drivers/net/wireless/iwlwifi/iwl-dev.h

+1 −0
Original line number Diff line number Diff line
@@ -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 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE