On 09/08/16 15:18, Philipp Zabel wrote:
> That way the init callback may clear the flag again, in case of drivers
> split between early irq chip and a normal platform driver.
>
> Fixes: 15cc2ed6dcf9 ("of/irq: Mark initialised interrupt controllers as
> populated")
> Suggested-by: Rob Herring <r...@kernel.org>
> Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
> Cc: Jon Hunter <jonath...@nvidia.com>
> ---
> drivers/of/irq.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/of/irq.c b/drivers/of/irq.c
> index 89a71c6..a2e68f7 100644
> --- a/drivers/of/irq.c
> +++ b/drivers/of/irq.c
> @@ -544,12 +544,15 @@ void __init of_irq_init(const struct of_device_id
> *matches)
>
> list_del(&desc->list);
>
> + of_node_set_flag(desc->dev, OF_POPULATED);
> +
> pr_debug("of_irq_init: init %s (%p), parent %p\n",
> desc->dev->full_name,
> desc->dev, desc->interrupt_parent);
> ret = desc->irq_init_cb(desc->dev,
> desc->interrupt_parent);
> if (ret) {
> + of_node_clear_flag(desc->dev, OF_POPULATED);
> kfree(desc);
> continue;
> }
> @@ -559,8 +562,6 @@ void __init of_irq_init(const struct of_device_id
> *matches)
> * its children can get processed in a subsequent pass.
> */
> list_add_tail(&desc->list, &intc_parent_list);
> -
> - of_node_set_flag(desc->dev, OF_POPULATED);
> }
>
> /* Get the next pending parent that might have children */
>
Acked-by: Jon Hunter <jonath...@nvidia.com>
Cheers
Jon
--
nvpublic
