net: airoha: Use qdma pointer as private structure in airoha_irq_handler routine

This is a preliminary patch to support multi-QDMA controllers.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/1e40c3cb973881c0eb3c3c247c78550da62054ab.1722522582.git.lorenzo@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mediatek/airoha_eth.c b/drivers/net/ethernet/mediatek/airoha_eth.c
index 54515c8a8b03a7c1ba71e23653baca38df7ad23d..2ded99434a17bdf31deae4c5218f6c11f54bc7ca 100644 (file)
--- a/drivers/net/ethernet/mediatek/airoha_eth.c
+++ b/drivers/net/ethernet/mediatek/airoha_eth.c
@@ -1973,8 +1973,7 @@ static int airoha_qdma_hw_init(struct airoha_qdma *qdma)
 
 static irqreturn_t airoha_irq_handler(int irq, void *dev_instance)
 {
-       struct airoha_eth *eth = dev_instance;
-       struct airoha_qdma *qdma = &eth->qdma[0];
+       struct airoha_qdma *qdma = dev_instance;
        u32 intr[ARRAY_SIZE(qdma->irqmask)];
        int i;
 
@@ -1984,7 +1983,7 @@ static irqreturn_t airoha_irq_handler(int irq, void *dev_instance)
                airoha_qdma_wr(qdma, REG_INT_STATUS(i), intr[i]);
        }
 
-       if (!test_bit(DEV_STATE_INITIALIZED, &eth->state))
+       if (!test_bit(DEV_STATE_INITIALIZED, &qdma->eth->state))
                return IRQ_NONE;
 
        if (intr[1] & RX_DONE_INT_MASK) {
@@ -2037,7 +2036,7 @@ static int airoha_qdma_init(struct platform_device *pdev,
                return qdma->irq;
 
        err = devm_request_irq(eth->dev, qdma->irq, airoha_irq_handler,
-                              IRQF_SHARED, KBUILD_MODNAME, eth);
+                              IRQF_SHARED, KBUILD_MODNAME, qdma);
        if (err)
                return err;