wifi: ath10k: Refer to INTX instead of LEGACY

To be consistent with the deprecation of PCI_IRQ_LEGACY and its
replacement with PCI_IRQ_INTX, rename macros and functions referencing
"legacy irq" to instead use the term "intx irq".

Link: https://lore.kernel.org/r/20240325070944.3600338-20-dlemoal@kernel.org
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/net/wireless/ath/ath10k/ahb.c b/drivers/net/wireless/ath/ath10k/ahb.c
index a378bc48b1d2b16299ea16c6579feb07f2bd3701..f0441b3d7dcb4039a75486768d3ae35af0bc0518 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/ahb.c
+++ b/drivers/net/wireless/ath/ath10k/ahb.c
@@ -394,14 +394,14 @@ static irqreturn_t ath10k_ahb_interrupt_handler(int irq, void *arg)
        if (!ath10k_pci_irq_pending(ar))
                return IRQ_NONE;
 
-       ath10k_pci_disable_and_clear_legacy_irq(ar);
+       ath10k_pci_disable_and_clear_intx_irq(ar);
        ath10k_pci_irq_msi_fw_mask(ar);
        napi_schedule(&ar->napi);
 
        return IRQ_HANDLED;
 }
 
-static int ath10k_ahb_request_irq_legacy(struct ath10k *ar)
+static int ath10k_ahb_request_irq_intx(struct ath10k *ar)
 {
        struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
        struct ath10k_ahb *ar_ahb = ath10k_ahb_priv(ar);
@@ -415,12 +415,12 @@ static int ath10k_ahb_request_irq_legacy(struct ath10k *ar)
                            ar_ahb->irq, ret);
                return ret;
        }
-       ar_pci->oper_irq_mode = ATH10K_PCI_IRQ_LEGACY;
+       ar_pci->oper_irq_mode = ATH10K_PCI_IRQ_INTX;
 
        return 0;
 }
 
-static void ath10k_ahb_release_irq_legacy(struct ath10k *ar)
+static void ath10k_ahb_release_irq_intx(struct ath10k *ar)
 {
        struct ath10k_ahb *ar_ahb = ath10k_ahb_priv(ar);
 
@@ -430,7 +430,7 @@ static void ath10k_ahb_release_irq_legacy(struct ath10k *ar)
 static void ath10k_ahb_irq_disable(struct ath10k *ar)
 {
        ath10k_ce_disable_interrupts(ar);
-       ath10k_pci_disable_and_clear_legacy_irq(ar);
+       ath10k_pci_disable_and_clear_intx_irq(ar);
 }
 
 static int ath10k_ahb_resource_init(struct ath10k *ar)
@@ -621,7 +621,7 @@ static int ath10k_ahb_hif_start(struct ath10k *ar)
 
        ath10k_core_napi_enable(ar);
        ath10k_ce_enable_interrupts(ar);
-       ath10k_pci_enable_legacy_irq(ar);
+       ath10k_pci_enable_intx_irq(ar);
 
        ath10k_pci_rx_post(ar);
 
@@ -775,7 +775,7 @@ static int ath10k_ahb_probe(struct platform_device *pdev)
 
        ath10k_pci_init_napi(ar);
 
-       ret = ath10k_ahb_request_irq_legacy(ar);
+       ret = ath10k_ahb_request_irq_intx(ar);
        if (ret)
                goto err_free_pipes;
 
@@ -806,7 +806,7 @@ err_halt_device:
        ath10k_ahb_clock_disable(ar);
 
 err_free_irq:
-       ath10k_ahb_release_irq_legacy(ar);
+       ath10k_ahb_release_irq_intx(ar);
 
 err_free_pipes:
        ath10k_pci_release_resource(ar);
@@ -828,7 +828,7 @@ static void ath10k_ahb_remove(struct platform_device *pdev)
 
        ath10k_core_unregister(ar);
        ath10k_ahb_irq_disable(ar);
-       ath10k_ahb_release_irq_legacy(ar);
+       ath10k_ahb_release_irq_intx(ar);
        ath10k_pci_release_resource(ar);
        ath10k_ahb_halt_chip(ar);
        ath10k_ahb_clock_disable(ar);

diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index 5c34b156b4ff49514be3a66bb2fda11a80202a52..6aeeab2edf5af3e14f5dc81ffc675b7ed2d556e8 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -721,7 +721,7 @@ bool ath10k_pci_irq_pending(struct ath10k *ar)
        return false;
 }
 
-void ath10k_pci_disable_and_clear_legacy_irq(struct ath10k *ar)
+void ath10k_pci_disable_and_clear_intx_irq(struct ath10k *ar)
 {
        /* IMPORTANT: INTR_CLR register has to be set after
         * INTR_ENABLE is set to 0, otherwise interrupt can not be
@@ -739,7 +739,7 @@ void ath10k_pci_disable_and_clear_legacy_irq(struct ath10k *ar)
                                PCIE_INTR_ENABLE_ADDRESS);
 }
 
-void ath10k_pci_enable_legacy_irq(struct ath10k *ar)
+void ath10k_pci_enable_intx_irq(struct ath10k *ar)
 {
        ath10k_pci_write32(ar, SOC_CORE_BASE_ADDRESS +
                           PCIE_INTR_ENABLE_ADDRESS,
@@ -1935,7 +1935,7 @@ static void ath10k_pci_irq_msi_fw_unmask(struct ath10k *ar)
 static void ath10k_pci_irq_disable(struct ath10k *ar)
 {
        ath10k_ce_disable_interrupts(ar);
-       ath10k_pci_disable_and_clear_legacy_irq(ar);
+       ath10k_pci_disable_and_clear_intx_irq(ar);
        ath10k_pci_irq_msi_fw_mask(ar);
 }
 
@@ -1949,7 +1949,7 @@ static void ath10k_pci_irq_sync(struct ath10k *ar)
 static void ath10k_pci_irq_enable(struct ath10k *ar)
 {
        ath10k_ce_enable_interrupts(ar);
-       ath10k_pci_enable_legacy_irq(ar);
+       ath10k_pci_enable_intx_irq(ar);
        ath10k_pci_irq_msi_fw_unmask(ar);
 }
 
@@ -3111,11 +3111,11 @@ static irqreturn_t ath10k_pci_interrupt_handler(int irq, void *arg)
                return IRQ_NONE;
        }
 
-       if ((ar_pci->oper_irq_mode == ATH10K_PCI_IRQ_LEGACY) &&
+       if ((ar_pci->oper_irq_mode == ATH10K_PCI_IRQ_INTX) &&
            !ath10k_pci_irq_pending(ar))
                return IRQ_NONE;
 
-       ath10k_pci_disable_and_clear_legacy_irq(ar);
+       ath10k_pci_disable_and_clear_intx_irq(ar);
        ath10k_pci_irq_msi_fw_mask(ar);
        napi_schedule(&ar->napi);
 
@@ -3152,7 +3152,7 @@ static int ath10k_pci_napi_poll(struct napi_struct *ctx, int budget)
                        napi_schedule(ctx);
                        goto out;
                }
-               ath10k_pci_enable_legacy_irq(ar);
+               ath10k_pci_enable_intx_irq(ar);
                ath10k_pci_irq_msi_fw_unmask(ar);
        }
 
@@ -3177,7 +3177,7 @@ static int ath10k_pci_request_irq_msi(struct ath10k *ar)
        return 0;
 }
 
-static int ath10k_pci_request_irq_legacy(struct ath10k *ar)
+static int ath10k_pci_request_irq_intx(struct ath10k *ar)
 {
        struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
        int ret;
@@ -3199,8 +3199,8 @@ static int ath10k_pci_request_irq(struct ath10k *ar)
        struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
 
        switch (ar_pci->oper_irq_mode) {
-       case ATH10K_PCI_IRQ_LEGACY:
-               return ath10k_pci_request_irq_legacy(ar);
+       case ATH10K_PCI_IRQ_INTX:
+               return ath10k_pci_request_irq_intx(ar);
        case ATH10K_PCI_IRQ_MSI:
                return ath10k_pci_request_irq_msi(ar);
        default:
@@ -3232,7 +3232,7 @@ static int ath10k_pci_init_irq(struct ath10k *ar)
                            ath10k_pci_irq_mode);
 
        /* Try MSI */
-       if (ath10k_pci_irq_mode != ATH10K_PCI_IRQ_LEGACY) {
+       if (ath10k_pci_irq_mode != ATH10K_PCI_IRQ_INTX) {
                ar_pci->oper_irq_mode = ATH10K_PCI_IRQ_MSI;
                ret = pci_enable_msi(ar_pci->pdev);
                if (ret == 0)
@@ -3250,7 +3250,7 @@ static int ath10k_pci_init_irq(struct ath10k *ar)
         * For now, fix the race by repeating the write in below
         * synchronization checking.
         */
-       ar_pci->oper_irq_mode = ATH10K_PCI_IRQ_LEGACY;
+       ar_pci->oper_irq_mode = ATH10K_PCI_IRQ_INTX;
 
        ath10k_pci_write32(ar, SOC_CORE_BASE_ADDRESS + PCIE_INTR_ENABLE_ADDRESS,
                           PCIE_INTR_FIRMWARE_MASK | PCIE_INTR_CE_MASK_ALL);
@@ -3258,7 +3258,7 @@ static int ath10k_pci_init_irq(struct ath10k *ar)
        return 0;
 }
 
-static void ath10k_pci_deinit_irq_legacy(struct ath10k *ar)
+static void ath10k_pci_deinit_irq_intx(struct ath10k *ar)
 {
        ath10k_pci_write32(ar, SOC_CORE_BASE_ADDRESS + PCIE_INTR_ENABLE_ADDRESS,
                           0);
@@ -3269,8 +3269,8 @@ static int ath10k_pci_deinit_irq(struct ath10k *ar)
        struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
 
        switch (ar_pci->oper_irq_mode) {
-       case ATH10K_PCI_IRQ_LEGACY:
-               ath10k_pci_deinit_irq_legacy(ar);
+       case ATH10K_PCI_IRQ_INTX:
+               ath10k_pci_deinit_irq_intx(ar);
                break;
        default:
                pci_disable_msi(ar_pci->pdev);
@@ -3307,14 +3307,14 @@ int ath10k_pci_wait_for_target_init(struct ath10k *ar)
                if (val & FW_IND_INITIALIZED)
                        break;
 
-               if (ar_pci->oper_irq_mode == ATH10K_PCI_IRQ_LEGACY)
+               if (ar_pci->oper_irq_mode == ATH10K_PCI_IRQ_INTX)
                        /* Fix potential race by repeating CORE_BASE writes */
-                       ath10k_pci_enable_legacy_irq(ar);
+                       ath10k_pci_enable_intx_irq(ar);
 
                mdelay(10);
        } while (time_before(jiffies, timeout));
 
-       ath10k_pci_disable_and_clear_legacy_irq(ar);
+       ath10k_pci_disable_and_clear_intx_irq(ar);
        ath10k_pci_irq_msi_fw_mask(ar);
 
        if (val == 0xffffffff) {

diff --git a/drivers/net/wireless/ath/ath10k/pci.h b/drivers/net/wireless/ath/ath10k/pci.h
index 27bb4cf2dfea937ed8f77101b6ff8c82fbe168cf..4c3f536f2ea1a95a78a0703d1f82d37d52f4b6d4 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/pci.h
+++ b/drivers/net/wireless/ath/ath10k/pci.h
@@ -101,7 +101,7 @@ struct ath10k_pci_supp_chip {
 
 enum ath10k_pci_irq_mode {
        ATH10K_PCI_IRQ_AUTO = 0,
-       ATH10K_PCI_IRQ_LEGACY = 1,
+       ATH10K_PCI_IRQ_INTX = 1,
        ATH10K_PCI_IRQ_MSI = 2,
 };
 
@@ -243,9 +243,9 @@ int ath10k_pci_init_pipes(struct ath10k *ar);
 int ath10k_pci_init_config(struct ath10k *ar);
 void ath10k_pci_rx_post(struct ath10k *ar);
 void ath10k_pci_flush(struct ath10k *ar);
-void ath10k_pci_enable_legacy_irq(struct ath10k *ar);
+void ath10k_pci_enable_intx_irq(struct ath10k *ar);
 bool ath10k_pci_irq_pending(struct ath10k *ar);
-void ath10k_pci_disable_and_clear_legacy_irq(struct ath10k *ar);
+void ath10k_pci_disable_and_clear_intx_irq(struct ath10k *ar);
 void ath10k_pci_irq_msi_fw_mask(struct ath10k *ar);
 int ath10k_pci_wait_for_target_init(struct ath10k *ar);
 int ath10k_pci_setup_resource(struct ath10k *ar);