提交 deff9b1d 编写于 作者: T Tom Rini

powerpc: Rework interrupt_init_cpu()

The function interrupt_init_cpu() is given an int return type but does
not return anything but 0.  Rework this to be a void function.
Signed-off-by: NTom Rini <trini@konsulko.com>
Acked-by: NMario Six <mario.six@gdsys.cc>
上级 76216211
......@@ -20,7 +20,7 @@ struct irq_action {
ulong count;
};
int interrupt_init_cpu (unsigned *decrementer_count)
void interrupt_init_cpu (unsigned *decrementer_count)
{
volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
......@@ -29,8 +29,6 @@ int interrupt_init_cpu (unsigned *decrementer_count)
/* Enable e300 time base */
immr->sysconf.spcr |= 0x00400000;
return 0;
}
......
......@@ -20,7 +20,7 @@
#include <post.h>
#endif
int interrupt_init_cpu(unsigned *decrementer_count)
void interrupt_init_cpu(unsigned *decrementer_count)
{
ccsr_pic_t __iomem *pic = (void *)CONFIG_SYS_MPC8xxx_PIC_ADDR;
......@@ -77,8 +77,6 @@ int interrupt_init_cpu(unsigned *decrementer_count)
#ifdef CONFIG_POST
post_word_store(post_word);
#endif
return (0);
}
/* Install and free a interrupt handler. Not implemented yet. */
......
......@@ -23,7 +23,7 @@
#include <post.h>
#endif
int interrupt_init_cpu(unsigned *decrementer_count)
void interrupt_init_cpu(unsigned *decrementer_count)
{
volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
volatile ccsr_pic_t *pic = &immr->im_pic;
......@@ -73,8 +73,6 @@ int interrupt_init_cpu(unsigned *decrementer_count)
#ifdef CONFIG_POST
post_word_store(post_word);
#endif
return 0;
}
/*
......
......@@ -30,7 +30,7 @@ static void cpm_interrupt(void *regs);
/************************************************************************/
int interrupt_init_cpu(unsigned *decrementer_count)
void interrupt_init_cpu(unsigned *decrementer_count)
{
immap_t __iomem *immr = (immap_t __iomem *)CONFIG_SYS_IMMR;
......@@ -41,8 +41,6 @@ int interrupt_init_cpu(unsigned *decrementer_count)
/* Configure CPM interrupts */
cpm_interrupt_init();
return 0;
}
/************************************************************************/
......
......@@ -122,7 +122,7 @@ static inline void set_msr(unsigned long msr)
void print_reginfo(void);
#endif
int interrupt_init_cpu(unsigned *);
void interrupt_init_cpu(unsigned *);
void timer_interrupt_cpu(struct pt_regs *);
unsigned long search_exception_table(unsigned long addr);
......
......@@ -63,13 +63,8 @@ int disable_interrupts (void)
int interrupt_init (void)
{
int ret;
/* call cpu specific function from $(CPU)/interrupts.c */
ret = interrupt_init_cpu (&decrementer_count);
if (ret)
return ret;
interrupt_init_cpu (&decrementer_count);
set_dec (decrementer_count);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册