diff options
author | Graf Yang <graf.yang@analog.com> | 2009-05-25 00:44:00 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-06-12 06:11:50 -0400 |
commit | c72aa0794a0ecc0b87ba9d5546215c26c8c80668 (patch) | |
tree | 7bd394bac5e1aa831b21e6dafe9cb149e094887d /arch/blackfin/mm/sram-alloc.c | |
parent | d1800fe0e50ed22673cd895f2b0a7c2b79d3010a (diff) |
Blackfin: merge sram init functions
Now that the sram_init() function exists only to call the bfin_sram_init()
after the punting of the reserve_pda() function, simply merge the two to
avoid pointless overhead.
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/mm/sram-alloc.c')
-rw-r--r-- | arch/blackfin/mm/sram-alloc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c index 530d1393a232..36376d8418fa 100644 --- a/arch/blackfin/mm/sram-alloc.c +++ b/arch/blackfin/mm/sram-alloc.c | |||
@@ -223,7 +223,7 @@ static void __init l2_sram_init(void) | |||
223 | spin_lock_init(&l2_sram_lock); | 223 | spin_lock_init(&l2_sram_lock); |
224 | } | 224 | } |
225 | 225 | ||
226 | void __init bfin_sram_init(void) | 226 | static int __init bfin_sram_init(void) |
227 | { | 227 | { |
228 | sram_piece_cache = kmem_cache_create("sram_piece_cache", | 228 | sram_piece_cache = kmem_cache_create("sram_piece_cache", |
229 | sizeof(struct sram_piece), | 229 | sizeof(struct sram_piece), |
@@ -233,7 +233,10 @@ void __init bfin_sram_init(void) | |||
233 | l1_data_sram_init(); | 233 | l1_data_sram_init(); |
234 | l1_inst_sram_init(); | 234 | l1_inst_sram_init(); |
235 | l2_sram_init(); | 235 | l2_sram_init(); |
236 | |||
237 | return 0; | ||
236 | } | 238 | } |
239 | pure_initcall(bfin_sram_init); | ||
237 | 240 | ||
238 | /* SRAM allocate function */ | 241 | /* SRAM allocate function */ |
239 | static void *_sram_alloc(size_t size, struct sram_piece *pfree_head, | 242 | static void *_sram_alloc(size_t size, struct sram_piece *pfree_head, |