Skip to content

Commit c0dcdee

Browse files
damien-lemoalLorenzo Pieralisi
authored andcommitted
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>
1 parent 3ba180c commit c0dcdee

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

drivers/pci/controller/dwc/pcie-uniphier-ep.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ static void uniphier_pcie_ep_init(struct dw_pcie_ep *ep)
212212
dw_pcie_ep_reset_bar(pci, bar);
213213
}
214214

215-
static int uniphier_pcie_ep_raise_legacy_irq(struct dw_pcie_ep *ep)
215+
static int uniphier_pcie_ep_raise_intx_irq(struct dw_pcie_ep *ep)
216216
{
217217
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
218218
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,
262262

263263
switch (type) {
264264
case PCI_IRQ_INTX:
265-
return uniphier_pcie_ep_raise_legacy_irq(ep);
265+
return uniphier_pcie_ep_raise_intx_irq(ep);
266266
case PCI_IRQ_MSI:
267267
return uniphier_pcie_ep_raise_msi_irq(ep, func_no,
268268
interrupt_num);

drivers/pci/controller/dwc/pcie-uniphier.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ struct uniphier_pcie {
6767
struct clk *clk;
6868
struct reset_control *rst;
6969
struct phy *phy;
70-
struct irq_domain *legacy_irq_domain;
70+
struct irq_domain *intx_irq_domain;
7171
};
7272

7373
#define to_uniphier_pcie(x) dev_get_drvdata((x)->dev)
@@ -253,12 +253,12 @@ static void uniphier_pcie_irq_handler(struct irq_desc *desc)
253253
reg = FIELD_GET(PCL_RCV_INTX_ALL_STATUS, val);
254254

255255
for_each_set_bit(bit, &reg, PCI_NUM_INTX)
256-
generic_handle_domain_irq(pcie->legacy_irq_domain, bit);
256+
generic_handle_domain_irq(pcie->intx_irq_domain, bit);
257257

258258
chained_irq_exit(chip, desc);
259259
}
260260

261-
static int uniphier_pcie_config_legacy_irq(struct dw_pcie_rp *pp)
261+
static int uniphier_pcie_config_intx_irq(struct dw_pcie_rp *pp)
262262
{
263263
struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
264264
struct uniphier_pcie *pcie = to_uniphier_pcie(pci);
@@ -279,9 +279,9 @@ static int uniphier_pcie_config_legacy_irq(struct dw_pcie_rp *pp)
279279
goto out_put_node;
280280
}
281281

282-
pcie->legacy_irq_domain = irq_domain_add_linear(np_intc, PCI_NUM_INTX,
282+
pcie->intx_irq_domain = irq_domain_add_linear(np_intc, PCI_NUM_INTX,
283283
&uniphier_intx_domain_ops, pp);
284-
if (!pcie->legacy_irq_domain) {
284+
if (!pcie->intx_irq_domain) {
285285
dev_err(pci->dev, "Failed to get INTx domain\n");
286286
ret = -ENODEV;
287287
goto out_put_node;
@@ -301,7 +301,7 @@ static int uniphier_pcie_host_init(struct dw_pcie_rp *pp)
301301
struct uniphier_pcie *pcie = to_uniphier_pcie(pci);
302302
int ret;
303303

304-
ret = uniphier_pcie_config_legacy_irq(pp);
304+
ret = uniphier_pcie_config_intx_irq(pp);
305305
if (ret)
306306
return ret;
307307

0 commit comments

Comments
 (0)