PCI: uniphier: Use INTX instead of legacy

In the Designware uniphier controller driver, including the endpoint
driver, change all names using "legacy" to use "intx", to match the
term used in the PCI specifications.

Link: https://lore.kernel.org/r/20231122060406.14695-14-dlemoal@kernel.org
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lpieralisi@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/pci/controller/dwc/pcie-uniphier-ep.c b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
index d47236d5678d2e037eb43383e15b059f53a7a81a..a45f94b284a2f729cb4516ffc65b688e4a1e8dfe 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-uniphier-ep.c
+++ b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
@@ -212,7 +212,7 @@ static void uniphier_pcie_ep_init(struct dw_pcie_ep *ep)
                dw_pcie_ep_reset_bar(pci, bar);
 }
 
-static int uniphier_pcie_ep_raise_legacy_irq(struct dw_pcie_ep *ep)
+static int uniphier_pcie_ep_raise_intx_irq(struct dw_pcie_ep *ep)
 {
        struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
        struct uniphier_pcie_ep_priv *priv = to_uniphier_pcie(pci);
@@ -262,7 +262,7 @@ static int uniphier_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
 
        switch (type) {
        case PCI_IRQ_INTX:
-               return uniphier_pcie_ep_raise_legacy_irq(ep);
+               return uniphier_pcie_ep_raise_intx_irq(ep);
        case PCI_IRQ_MSI:
                return uniphier_pcie_ep_raise_msi_irq(ep, func_no,
                                                      interrupt_num);

diff --git a/drivers/pci/controller/dwc/pcie-uniphier.c b/drivers/pci/controller/dwc/pcie-uniphier.c
index 48c3eba817b43cae49b887be2c95a2bec63dfdb8..ff16b7345cfc6abe71311689767563a3696dc3ec 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-uniphier.c
+++ b/drivers/pci/controller/dwc/pcie-uniphier.c
@@ -67,7 +67,7 @@ struct uniphier_pcie {
        struct clk *clk;
        struct reset_control *rst;
        struct phy *phy;
-       struct irq_domain *legacy_irq_domain;
+       struct irq_domain *intx_irq_domain;
 };
 
 #define to_uniphier_pcie(x)    dev_get_drvdata((x)->dev)
@@ -253,12 +253,12 @@ static void uniphier_pcie_irq_handler(struct irq_desc *desc)
        reg = FIELD_GET(PCL_RCV_INTX_ALL_STATUS, val);
 
        for_each_set_bit(bit, &reg, PCI_NUM_INTX)
-               generic_handle_domain_irq(pcie->legacy_irq_domain, bit);
+               generic_handle_domain_irq(pcie->intx_irq_domain, bit);
 
        chained_irq_exit(chip, desc);
 }
 
-static int uniphier_pcie_config_legacy_irq(struct dw_pcie_rp *pp)
+static int uniphier_pcie_config_intx_irq(struct dw_pcie_rp *pp)
 {
        struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
        struct uniphier_pcie *pcie = to_uniphier_pcie(pci);
@@ -279,9 +279,9 @@ static int uniphier_pcie_config_legacy_irq(struct dw_pcie_rp *pp)
                goto out_put_node;
        }
 
-       pcie->legacy_irq_domain = irq_domain_add_linear(np_intc, PCI_NUM_INTX,
+       pcie->intx_irq_domain = irq_domain_add_linear(np_intc, PCI_NUM_INTX,
                                                &uniphier_intx_domain_ops, pp);
-       if (!pcie->legacy_irq_domain) {
+       if (!pcie->intx_irq_domain) {
                dev_err(pci->dev, "Failed to get INTx domain\n");
                ret = -ENODEV;
                goto out_put_node;
@@ -301,7 +301,7 @@ static int uniphier_pcie_host_init(struct dw_pcie_rp *pp)
        struct uniphier_pcie *pcie = to_uniphier_pcie(pci);
        int ret;
 
-       ret = uniphier_pcie_config_legacy_irq(pp);
+       ret = uniphier_pcie_config_intx_irq(pp);
        if (ret)
                return ret;