Re: [PATCH v3 09/14] irqchip: Provide platform_device to of_irq_init_cb_t

[Rob Herring]

On Tue, Sep 28, 2021 at 1:22 PM Florian Fainelli <f.fainelli@xxxxxxxxx> wrote:
>
> Provide the platform device mapping to the interrupt controller node to
> the of_irq_init_cb_t callback such that drivers can make use of it.
>
> Signed-off-by: Florian Fainelli <f.fainelli@xxxxxxxxx>
> ---
>  drivers/irqchip/irqchip.c | 2 +-
>  drivers/of/irq.c          | 2 +-
>  include/linux/of_irq.h    | 5 ++++-
>  3 files changed, 6 insertions(+), 3 deletions(-)

Less invasive than I thought as we lose any function typing. Maybe at
least the one platform driver, drivers/irqchip/qcom-pdc.c, should have
its function parameters updated.

Reviewed-by: Rob Herring <robh@xxxxxxxxxx>

>
> diff --git a/drivers/irqchip/irqchip.c b/drivers/irqchip/irqchip.c
> index 3570f0a588c4..289784eefd00 100644
> --- a/drivers/irqchip/irqchip.c
> +++ b/drivers/irqchip/irqchip.c
> @@ -55,6 +55,6 @@ int platform_irqchip_probe(struct platform_device *pdev)
>         if (par_np && !irq_find_matching_host(par_np, DOMAIN_BUS_ANY))
>                 return -EPROBE_DEFER;
>
> -       return irq_init_cb(np, par_np);
> +       return irq_init_cb(np, par_np, pdev);
>  }
>  EXPORT_SYMBOL_GPL(platform_irqchip_probe);
> diff --git a/drivers/of/irq.c b/drivers/of/irq.c
> index 352e14b007e7..18f3f5c00c87 100644
> --- a/drivers/of/irq.c
> +++ b/drivers/of/irq.c
> @@ -538,7 +538,7 @@ void __init of_irq_init(const struct of_device_id *matches)
>                                  desc->dev,
>                                  desc->dev, desc->interrupt_parent);
>                         ret = desc->irq_init_cb(desc->dev,
> -                                               desc->interrupt_parent);
> +                                               desc->interrupt_parent, NULL);
>                         if (ret) {
>                                 of_node_clear_flag(desc->dev, OF_POPULATED);
>                                 kfree(desc);
> diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
> index aaf219bd0354..89acc8b089f0 100644
> --- a/include/linux/of_irq.h
> +++ b/include/linux/of_irq.h
> @@ -9,7 +9,10 @@
>  #include <linux/ioport.h>
>  #include <linux/of.h>
>
> -typedef int (*of_irq_init_cb_t)(struct device_node *, struct device_node *);
> +struct platform_device;
> +
> +typedef int (*of_irq_init_cb_t)(struct device_node *, struct device_node *,
> +                               struct platform_device *);
>
>  /*
>   * Workarounds only applied to 32bit powermac machines
> --
> 2.25.1
>