Переглянути джерело

PCI: mediatek: Use PCI_NUM_INTX

Switch from using custom INTX_NUM macro to the generic PCI_NUM_INTX definition
for the number of INTx interrupts.

Signed-off-by: Honghui Zhang <honghui.zhang@mediatek.com>
[bhelgaas: use subject/changelog from similar patches]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Honghui Zhang 8 роки тому
батько
коміт
d84c246b73
1 змінених файлів з 2 додано та 3 видалено
  1. 2 3
      drivers/pci/host/pcie-mediatek.c

+ 2 - 3
drivers/pci/host/pcie-mediatek.c

@@ -77,7 +77,6 @@
 #define PCIE_INT_MASK		0x420
 #define PCIE_INT_MASK		0x420
 #define INTX_MASK		GENMASK(19, 16)
 #define INTX_MASK		GENMASK(19, 16)
 #define INTX_SHIFT		16
 #define INTX_SHIFT		16
-#define INTX_NUM		4
 #define PCIE_INT_STATUS		0x424
 #define PCIE_INT_STATUS		0x424
 #define MSI_STATUS		BIT(23)
 #define MSI_STATUS		BIT(23)
 #define PCIE_IMSI_STATUS	0x42c
 #define PCIE_IMSI_STATUS	0x42c
@@ -576,7 +575,7 @@ static int mtk_pcie_init_irq_domain(struct mtk_pcie_port *port,
 		return -ENODEV;
 		return -ENODEV;
 	}
 	}
 
 
-	port->irq_domain = irq_domain_add_linear(pcie_intc_node, INTX_NUM,
+	port->irq_domain = irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX,
 						 &intx_domain_ops, port);
 						 &intx_domain_ops, port);
 	if (!port->irq_domain) {
 	if (!port->irq_domain) {
 		dev_err(dev, "failed to get INTx IRQ domain\n");
 		dev_err(dev, "failed to get INTx IRQ domain\n");
@@ -605,7 +604,7 @@ static irqreturn_t mtk_pcie_intr_handler(int irq, void *data)
 	u32 bit = INTX_SHIFT;
 	u32 bit = INTX_SHIFT;
 
 
 	while ((status = readl(port->base + PCIE_INT_STATUS)) & INTX_MASK) {
 	while ((status = readl(port->base + PCIE_INT_STATUS)) & INTX_MASK) {
-		for_each_set_bit_from(bit, &status, INTX_NUM + INTX_SHIFT) {
+		for_each_set_bit_from(bit, &status, PCI_NUM_INTX + INTX_SHIFT) {
 			/* Clear the INTx */
 			/* Clear the INTx */
 			writel(1 << bit, port->base + PCIE_INT_STATUS);
 			writel(1 << bit, port->base + PCIE_INT_STATUS);
 			virq = irq_find_mapping(port->irq_domain,
 			virq = irq_find_mapping(port->irq_domain,