Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit deff9b1d2ab24955cc4f881d63a701f40d6b491f

Authored by Tom Rini
1 parent 76216211f8
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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: Tom Rini <trini@konsulko.com>
Acked-by: Mario Six <mario.six@gdsys.cc>

Showing 6 changed files with 6 additions and 19 deletions Side-by-side Diff

arch/powerpc/cpu/mpc83xx/interrupts.c
Diff comments   View file @ deff9b1
... ... @@ -20,7 +20,7 @@
20 20 ulong count;
21 21 };
22 22  
23   -int interrupt_init_cpu (unsigned *decrementer_count)
  23 +void interrupt_init_cpu (unsigned *decrementer_count)
24 24 {
25 25 volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
26 26  
... ... @@ -29,8 +29,6 @@
29 29 /* Enable e300 time base */
30 30  
31 31 immr->sysconf.spcr |= 0x00400000;
32   -
33   - return 0;
34 32 }
35 33  
36 34  
arch/powerpc/cpu/mpc85xx/interrupts.c
Diff comments   View file @ deff9b1
... ... @@ -20,7 +20,7 @@
20 20 #include <post.h>
21 21 #endif
22 22  
23   -int interrupt_init_cpu(unsigned *decrementer_count)
  23 +void interrupt_init_cpu(unsigned *decrementer_count)
24 24 {
25 25 ccsr_pic_t __iomem *pic = (void *)CONFIG_SYS_MPC8xxx_PIC_ADDR;
26 26  
... ... @@ -77,8 +77,6 @@
77 77 #ifdef CONFIG_POST
78 78 post_word_store(post_word);
79 79 #endif
80   -
81   - return (0);
82 80 }
83 81  
84 82 /* Install and free a interrupt handler. Not implemented yet. */
arch/powerpc/cpu/mpc86xx/interrupts.c
Diff comments   View file @ deff9b1
... ... @@ -23,7 +23,7 @@
23 23 #include <post.h>
24 24 #endif
25 25  
26   -int interrupt_init_cpu(unsigned *decrementer_count)
  26 +void interrupt_init_cpu(unsigned *decrementer_count)
27 27 {
28 28 volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
29 29 volatile ccsr_pic_t *pic = &immr->im_pic;
... ... @@ -73,8 +73,6 @@
73 73 #ifdef CONFIG_POST
74 74 post_word_store(post_word);
75 75 #endif
76   -
77   - return 0;
78 76 }
79 77  
80 78 /*
arch/powerpc/cpu/mpc8xx/interrupts.c
Diff comments   View file @ deff9b1
... ... @@ -30,7 +30,7 @@
30 30  
31 31 /************************************************************************/
32 32  
33   -int interrupt_init_cpu(unsigned *decrementer_count)
  33 +void interrupt_init_cpu(unsigned *decrementer_count)
34 34 {
35 35 immap_t __iomem *immr = (immap_t __iomem *)CONFIG_SYS_IMMR;
36 36  
... ... @@ -41,8 +41,6 @@
41 41  
42 42 /* Configure CPM interrupts */
43 43 cpm_interrupt_init();
44   -
45   - return 0;
46 44 }
47 45  
48 46 /************************************************************************/
arch/powerpc/include/asm/ppc.h
Diff comments   View file @ deff9b1
... ... @@ -122,7 +122,7 @@
122 122 void print_reginfo(void);
123 123 #endif
124 124  
125   -int interrupt_init_cpu(unsigned *);
  125 +void interrupt_init_cpu(unsigned *);
126 126 void timer_interrupt_cpu(struct pt_regs *);
127 127 unsigned long search_exception_table(unsigned long addr);
128 128  
arch/powerpc/lib/interrupts.c
Diff comments   View file @ deff9b1
... ... @@ -63,13 +63,8 @@
63 63  
64 64 int interrupt_init (void)
65 65 {
66   - int ret;
67   -
68 66 /* call cpu specific function from $(CPU)/interrupts.c */
69   - ret = interrupt_init_cpu (&decrementer_count);
70   -
71   - if (ret)
72   - return ret;
  67 + interrupt_init_cpu (&decrementer_count);
73 68  
74 69 set_dec (decrementer_count);
75 70