[v4,06/10] PCI: altera: Use pci_host_alloc_intx_irqd() helper to get irq domain for INTx

Message ID 1528940145-183495-1-git-send-email-shawn.lin@rock-chips.com
State Changes Requested
Delegated to: Lorenzo Pieralisi
Headers show
Series
  • Add new helper to allocate IRQ domain for host drivers
Related show

Commit Message

Shawn Lin June 14, 2018, 1:35 a.m.
Just avoid code duplication, but no functional change intended.

Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---

Changes in v4: None
Changes in v3: None
Changes in v2: None

 drivers/pci/controller/pcie-altera.c | 38 ++++--------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

Comments

Ley Foon Tan June 14, 2018, 10:51 a.m. | #1
On Thu, 2018-06-14 at 09:35 +0800, Shawn Lin wrote:
> Just avoid code duplication, but no functional change intended.
> 
> Cc: Ley Foon Tan <ley.foon.tan@intel.com>
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

Reviewed-by: Ley Foon Tan <ley.foon.tan@intel.com>
> ---
> 
> Changes in v4: None
> Changes in v3: None
> Changes in v2: None
> 
>  drivers/pci/controller/pcie-altera.c | 38 ++++--------------------
> ------------
>  1 file changed, 4 insertions(+), 34 deletions(-)
> 
> diff --git a/drivers/pci/controller/pcie-altera.c
> b/drivers/pci/controller/pcie-altera.c
> index 7d05e51..0915c8b 100644
> --- a/drivers/pci/controller/pcie-altera.c
> +++ b/drivers/pci/controller/pcie-altera.c
> @@ -443,19 +443,6 @@ static void altera_pcie_retrain(struct
> altera_pcie *pcie)
>  	}
>  }
>  
> -static int altera_pcie_intx_map(struct irq_domain *domain, unsigned
> int irq,
> -				irq_hw_number_t hwirq)
> -{
> -	irq_set_chip_and_handler(irq, &dummy_irq_chip,
> handle_simple_irq);
> -	irq_set_chip_data(irq, domain->host_data);
> -	return 0;
> -}
> -
> -static const struct irq_domain_ops intx_domain_ops = {
> -	.map = altera_pcie_intx_map,
> -	.xlate = pci_irqd_intx_xlate,
> -};
> -
>  static void altera_pcie_isr(struct irq_desc *desc)
>  {
>  	struct irq_chip *chip = irq_desc_get_chip(desc);
> @@ -519,22 +506,6 @@ static int
> altera_pcie_parse_request_of_pci_ranges(struct altera_pcie *pcie)
>  	return err;
>  }
>  
> -static int altera_pcie_init_irq_domain(struct altera_pcie *pcie)
> -{
> -	struct device *dev = &pcie->pdev->dev;
> -	struct device_node *node = dev->of_node;
> -
> -	/* Setup INTx */
> -	pcie->irq_domain = irq_domain_add_linear(node, PCI_NUM_INTX,
> -					&intx_domain_ops, pcie);
> -	if (!pcie->irq_domain) {
> -		dev_err(dev, "Failed to get a INTx IRQ domain\n");
> -		return -ENOMEM;
> -	}
> -
> -	return 0;
> -}
> -
>  static int altera_pcie_parse_dt(struct altera_pcie *pcie)
>  {
>  	struct device *dev = &pcie->pdev->dev;
> @@ -592,11 +563,10 @@ static int altera_pcie_probe(struct
> platform_device *pdev)
>  		return ret;
>  	}
>  
> -	ret = altera_pcie_init_irq_domain(pcie);
> -	if (ret) {
> -		dev_err(dev, "Failed creating IRQ Domain\n");
> -		return ret;
> -	}
> +	pcie->irq_domain = pci_host_alloc_intx_irqd(dev, pcie, true,
> NULL,
> +						    dev->of_node);
> +	if (IS_ERR(pcie->irq_domain))
> +		return PTR_ERR(pcie->irq_domain);
>  
>  	/* clear all interrupts */
>  	cra_writel(pcie, P2A_INT_STS_ALL, P2A_INT_STATUS);

Patch

diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/pcie-altera.c
index 7d05e51..0915c8b 100644
--- a/drivers/pci/controller/pcie-altera.c
+++ b/drivers/pci/controller/pcie-altera.c
@@ -443,19 +443,6 @@  static void altera_pcie_retrain(struct altera_pcie *pcie)
 	}
 }
 
-static int altera_pcie_intx_map(struct irq_domain *domain, unsigned int irq,
-				irq_hw_number_t hwirq)
-{
-	irq_set_chip_and_handler(irq, &dummy_irq_chip, handle_simple_irq);
-	irq_set_chip_data(irq, domain->host_data);
-	return 0;
-}
-
-static const struct irq_domain_ops intx_domain_ops = {
-	.map = altera_pcie_intx_map,
-	.xlate = pci_irqd_intx_xlate,
-};
-
 static void altera_pcie_isr(struct irq_desc *desc)
 {
 	struct irq_chip *chip = irq_desc_get_chip(desc);
@@ -519,22 +506,6 @@  static int altera_pcie_parse_request_of_pci_ranges(struct altera_pcie *pcie)
 	return err;
 }
 
-static int altera_pcie_init_irq_domain(struct altera_pcie *pcie)
-{
-	struct device *dev = &pcie->pdev->dev;
-	struct device_node *node = dev->of_node;
-
-	/* Setup INTx */
-	pcie->irq_domain = irq_domain_add_linear(node, PCI_NUM_INTX,
-					&intx_domain_ops, pcie);
-	if (!pcie->irq_domain) {
-		dev_err(dev, "Failed to get a INTx IRQ domain\n");
-		return -ENOMEM;
-	}
-
-	return 0;
-}
-
 static int altera_pcie_parse_dt(struct altera_pcie *pcie)
 {
 	struct device *dev = &pcie->pdev->dev;
@@ -592,11 +563,10 @@  static int altera_pcie_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	ret = altera_pcie_init_irq_domain(pcie);
-	if (ret) {
-		dev_err(dev, "Failed creating IRQ Domain\n");
-		return ret;
-	}
+	pcie->irq_domain = pci_host_alloc_intx_irqd(dev, pcie, true, NULL,
+						    dev->of_node);
+	if (IS_ERR(pcie->irq_domain))
+		return PTR_ERR(pcie->irq_domain);
 
 	/* clear all interrupts */
 	cra_writel(pcie, P2A_INT_STS_ALL, P2A_INT_STATUS);