[U-Boot] [PATCH v2 6/9] x86: Allow pirq_init() to return an error

[Bin Meng]

On Sat, Aug 8, 2015 at 10:26 PM, Simon Glass <sjg at chromium.org> wrote:
> This function can fail. In this case we should return the error rather than
> swallowing it.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
> Changes in v2:
> - Add new patch to allow pirq_init() to return an error
>
>  arch/x86/cpu/baytrail/valleyview.c |  4 +---
>  arch/x86/cpu/irq.c                 | 17 +++++++++++------
>  arch/x86/cpu/qemu/qemu.c           |  4 +---
>  arch/x86/cpu/quark/quark.c         |  4 +---
>  arch/x86/cpu/queensbay/tnc.c       |  4 +---
>  arch/x86/include/asm/irq.h         |  4 +++-
>  6 files changed, 18 insertions(+), 19 deletions(-)
>
> diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c
> index 610e9d9..225ea38 100644
> --- a/arch/x86/cpu/baytrail/valleyview.c
> +++ b/arch/x86/cpu/baytrail/valleyview.c
> @@ -40,8 +40,6 @@ int arch_cpu_init(void)
>
>  int arch_misc_init(void)
>  {
> -       pirq_init();
> -
> -       return 0;
> +       return pirq_init();
>  }
>  #endif
> diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c
> index 6be2f81..35b29f6 100644
> --- a/arch/x86/cpu/irq.c
> +++ b/arch/x86/cpu/irq.c
> @@ -225,17 +225,22 @@ static int create_pirq_routing_table(void)
>         return 0;
>  }
>
> -void pirq_init(void)
> +int pirq_init(void)
>  {
> +       int ret;
> +
>         cpu_irq_init();
>
> -       if (create_pirq_routing_table()) {
> +       ret = create_pirq_routing_table();
> +       if (ret) {
>                 debug("Failed to create pirq routing table\n");
> -       } else {
> -               /* Route PIRQ */
> -               pirq_route_irqs(pirq_routing_table->slots,
> -                               get_irq_slot_count(pirq_routing_table));
> +               return ret;
>         }
> +       /* Route PIRQ */
> +       pirq_route_irqs(pirq_routing_table->slots,
> +                       get_irq_slot_count(pirq_routing_table));
> +
> +       return 0;
>  }
>
>  u32 write_pirq_routing_table(u32 addr)
> diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c
> index 64634a9..7c03e02 100644
> --- a/arch/x86/cpu/qemu/qemu.c
> +++ b/arch/x86/cpu/qemu/qemu.c
> @@ -41,7 +41,5 @@ void reset_cpu(ulong addr)
>
>  int arch_misc_init(void)
>  {
> -       pirq_init();
> -
> -       return 0;
> +       return pirq_init();
>  }
> diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c
> index 20cc09e..12ac376 100644
> --- a/arch/x86/cpu/quark/quark.c
> +++ b/arch/x86/cpu/quark/quark.c
> @@ -174,7 +174,5 @@ void cpu_irq_init(void)
>
>  int arch_misc_init(void)
>  {
> -       pirq_init();
> -
> -       return 0;
> +       return pirq_init();
>  }
> diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c
> index de50893..c465642 100644
> --- a/arch/x86/cpu/queensbay/tnc.c
> +++ b/arch/x86/cpu/queensbay/tnc.c
> @@ -80,7 +80,5 @@ void cpu_irq_init(void)
>
>  int arch_misc_init(void)
>  {
> -       pirq_init();
> -
> -       return 0;
> +       return pirq_init();
>  }
> diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h
> index 4de5512..6697da3 100644
> --- a/arch/x86/include/asm/irq.h
> +++ b/arch/x86/include/asm/irq.h
> @@ -70,7 +70,9 @@ void cpu_irq_init(void);
>   *
>   * This initializes the PIRQ routing on the platform and configures all PCI
>   * devices' interrupt line register to a working IRQ number on the 8259 PIC.
> + *
> + * @return 0 if OK, -ve on error
>   */
> -void pirq_init(void);
> +int pirq_init(void);
>
>  #endif /* _ARCH_IRQ_H_ */
> --

Reviewed-by: Bin Meng <bmeng.cn at gmail.com>