Re: [PATCH] ata: Use platform_get_irq() to get the interrupt

From: Damien Le Moal
Date: Tue Mar 08 2022 - 00:50:08 EST


On 3/8/22 11:59, cgel.zte@xxxxxxxxx wrote:
> From: Minghao Chi (CGEL ZTE) <chi.minghao@xxxxxxxxxx>
>
> platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static
> allocation of IRQ resources in DT core code, this causes an issue
> when using hierarchical interrupt domains using "interrupts" property
> in the node as this bypassed the hierarchical setup and messed up the
> irq chaining.
>
> In preparation for removal of static setup of IRQ resource from DT core
> code use platform_get_irq().
>
> Reported-by: Zeal Robot <zealci@xxxxxxxxxx>
> Signed-off-by: Minghao Chi (CGEL ZTE) <chi.minghao@xxxxxxxxxx>
> ---
> drivers/ata/pata_pxa.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c
> index 41430f79663c..6394ab4cbc1b 100644
> --- a/drivers/ata/pata_pxa.c
> +++ b/drivers/ata/pata_pxa.c
> @@ -164,10 +164,10 @@ static int pxa_ata_probe(struct platform_device *pdev)
> struct resource *cmd_res;
> struct resource *ctl_res;
> struct resource *dma_res;
> - struct resource *irq_res;
> struct pata_pxa_pdata *pdata = dev_get_platdata(&pdev->dev);
> struct dma_slave_config config;
> int ret = 0;
> + int irq;
>
> /*
> * Resource validation, three resources are needed:
> @@ -205,8 +205,8 @@ static int pxa_ata_probe(struct platform_device *pdev)
> /*
> * IRQ pin
> */
> - irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
> - if (unlikely(irq_res == NULL))
> + irq = platform_get_irq(pdev, 0);
> + if (unlikely(irq < 0))

This is not the hot path, so let's simplify: drop the unlikely() from
this if.

> return -EINVAL;
>
> /*
> @@ -287,7 +287,7 @@ static int pxa_ata_probe(struct platform_device *pdev)
> /*
> * Activate the ATA host
> */
> - ret = ata_host_activate(host, irq_res->start, ata_sff_interrupt,
> + ret = ata_host_activate(host, irq, ata_sff_interrupt,
> pdata->irq_flags, &pxa_ata_sht);
> if (ret)
> dma_release_channel(data->dma_chan);


--
Damien Le Moal
Western Digital Research