x86: Allow pirq_init() to return an error

This function can fail. In this case we should return the error rather than
swallowing it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2015-08-10 07:05:08 -06:00
parent 412400abaa
commit 7e4be120e8
6 changed files with 18 additions and 19 deletions

View File

@ -40,8 +40,6 @@ int arch_cpu_init(void)
int arch_misc_init(void)
{
pirq_init();
return 0;
return pirq_init();
}
#endif

View File

@ -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)

View File

@ -41,7 +41,5 @@ void reset_cpu(ulong addr)
int arch_misc_init(void)
{
pirq_init();
return 0;
return pirq_init();
}

View File

@ -174,7 +174,5 @@ void cpu_irq_init(void)
int arch_misc_init(void)
{
pirq_init();
return 0;
return pirq_init();
}

View File

@ -80,7 +80,5 @@ void cpu_irq_init(void)
int arch_misc_init(void)
{
pirq_init();
return 0;
return pirq_init();
}

View File

@ -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_ */