mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 21:54:06 +08:00
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>
This commit is contained in:
parent
4b55b07fc9
commit
705cd4513a
@ -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);
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user