iwlagn: move the tasklet / irq to the transport layer

PCIe doesn't provide any ISR registration API, whereas other buses do.
Hence, we need to move the tasklet and irq to the transport layer to allow this
flexibility.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

1 files changed, 27 insertions, 2 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.c b/drivers/net/wireless/iwlwifi/iwl-trans.c
index acd2a5feec93..ecdda6d57b16 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.c
@@ -705,6 +705,12 @@ static int iwl_trans_tx(struct iwl_priv *priv, struct sk_buff *skb,
         return 0;
 }
 
+static void iwl_trans_free(struct iwl_priv *priv)
+{
+        free_irq(priv->bus.irq, priv);
+        iwl_free_isr_ict(priv);
+}
+
 static const struct iwl_trans_ops trans_ops = {
         .rx_init = iwl_trans_rx_init,
         .rx_stop = iwl_trans_rx_stop,
@@ -719,9 +725,28 @@ static const struct iwl_trans_ops trans_ops = {
 
         .get_tx_cmd = iwl_trans_get_tx_cmd,
         .tx = iwl_trans_tx,
+
+        .free = iwl_trans_free,
 };
 
-void iwl_trans_register(struct iwl_trans *trans)
+int iwl_trans_register(struct iwl_priv *priv)
 {
-        trans->ops = &trans_ops;
+        int err;
+
+        priv->trans.ops = &trans_ops;
+
+        iwl_alloc_isr_ict(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.irq);
+                iwl_free_isr_ict(priv);
+                return err;
+        }
+
+        tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long))
+                iwl_irq_tasklet, (unsigned long)priv);
+
+        return 0;
 }