diff options
Diffstat (limited to 'arch/blackfin/kernel/cplb-nompu/cplbinit.c')
-rw-r--r-- | arch/blackfin/kernel/cplb-nompu/cplbinit.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/arch/blackfin/kernel/cplb-nompu/cplbinit.c index c17c988fb719..b0d6084de359 100644 --- a/arch/blackfin/kernel/cplb-nompu/cplbinit.c +++ b/arch/blackfin/kernel/cplb-nompu/cplbinit.c | |||
@@ -20,6 +20,7 @@ | |||
20 | * to the Free Software Foundation, Inc., | 20 | * to the Free Software Foundation, Inc., |
21 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 21 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
22 | */ | 22 | */ |
23 | |||
23 | #include <linux/module.h> | 24 | #include <linux/module.h> |
24 | 25 | ||
25 | #include <asm/blackfin.h> | 26 | #include <asm/blackfin.h> |
@@ -169,7 +170,7 @@ static bool __init lock_kernel_check(u32 start, u32 end) | |||
169 | return true; | 170 | return true; |
170 | } | 171 | } |
171 | 172 | ||
172 | static unsigned short __init | 173 | static void __init |
173 | fill_cplbtab(struct cplb_tab *table, | 174 | fill_cplbtab(struct cplb_tab *table, |
174 | unsigned long start, unsigned long end, | 175 | unsigned long start, unsigned long end, |
175 | unsigned long block_size, unsigned long cplb_data) | 176 | unsigned long block_size, unsigned long cplb_data) |
@@ -206,19 +207,12 @@ fill_cplbtab(struct cplb_tab *table, | |||
206 | 207 | ||
207 | start += block_size; | 208 | start += block_size; |
208 | } | 209 | } |
209 | return 0; | ||
210 | } | 210 | } |
211 | 211 | ||
212 | static unsigned short __init | 212 | static void __init close_cplbtab(struct cplb_tab *table) |
213 | close_cplbtab(struct cplb_tab *table) | ||
214 | { | 213 | { |
215 | 214 | while (table->pos < table->size) | |
216 | while (table->pos < table->size) { | ||
217 | |||
218 | table->tab[table->pos++] = 0; | 215 | table->tab[table->pos++] = 0; |
219 | table->tab[table->pos++] = 0; /* !CPLB_VALID */ | ||
220 | } | ||
221 | return 0; | ||
222 | } | 216 | } |
223 | 217 | ||
224 | /* helper function */ | 218 | /* helper function */ |
@@ -426,7 +420,7 @@ void __init generate_cplb_tables_cpu(unsigned int cpu) | |||
426 | } | 420 | } |
427 | } | 421 | } |
428 | 422 | ||
429 | /* close tables */ | 423 | /* close tables */ |
430 | 424 | ||
431 | close_cplbtab(&cplb.init_i); | 425 | close_cplbtab(&cplb.init_i); |
432 | close_cplbtab(&cplb.init_d); | 426 | close_cplbtab(&cplb.init_d); |
@@ -437,5 +431,5 @@ void __init generate_cplb_tables_cpu(unsigned int cpu) | |||
437 | cplb.switch_d.tab[cplb.switch_d.pos] = -1; | 431 | cplb.switch_d.tab[cplb.switch_d.pos] = -1; |
438 | 432 | ||
439 | } | 433 | } |
440 | #endif | ||
441 | 434 | ||
435 | #endif | ||