diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-06-20 09:55:10 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-06-27 03:59:44 -0400 |
commit | d670b479586e457c7c36604cea08ae236fb933ac (patch) | |
tree | adf24ef3bfc93f4ce4d3cc26cc2303a1a4db2f17 /arch/m68k | |
parent | e653614b28d77caa7e4405d2f259aac668f81b80 (diff) |
m68k/sun3: Remove unselectable code in prom_init()
This was copied from SPARC, but isn't relevant for the supported Sun-3
models.
[Geert] Also remove the related extern declarations, and update the
comment about prom_init().
Reported-by: Sarah Nadi <snadi@uwaterloo.ca>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/sun3/prom/init.c | 48 |
1 files changed, 2 insertions, 46 deletions
diff --git a/arch/m68k/sun3/prom/init.c b/arch/m68k/sun3/prom/init.c index d8e6349336b4..eeba067d565f 100644 --- a/arch/m68k/sun3/prom/init.c +++ b/arch/m68k/sun3/prom/init.c | |||
@@ -22,57 +22,13 @@ int prom_root_node; | |||
22 | struct linux_nodeops *prom_nodeops; | 22 | struct linux_nodeops *prom_nodeops; |
23 | 23 | ||
24 | /* You must call prom_init() before you attempt to use any of the | 24 | /* You must call prom_init() before you attempt to use any of the |
25 | * routines in the prom library. It returns 0 on success, 1 on | 25 | * routines in the prom library. |
26 | * failure. It gets passed the pointer to the PROM vector. | 26 | * It gets passed the pointer to the PROM vector. |
27 | */ | 27 | */ |
28 | 28 | ||
29 | extern void prom_meminit(void); | ||
30 | extern void prom_ranges_init(void); | ||
31 | |||
32 | void __init prom_init(struct linux_romvec *rp) | 29 | void __init prom_init(struct linux_romvec *rp) |
33 | { | 30 | { |
34 | romvec = rp; | 31 | romvec = rp; |
35 | #ifndef CONFIG_SUN3 | ||
36 | switch(romvec->pv_romvers) { | ||
37 | case 0: | ||
38 | prom_vers = PROM_V0; | ||
39 | break; | ||
40 | case 2: | ||
41 | prom_vers = PROM_V2; | ||
42 | break; | ||
43 | case 3: | ||
44 | prom_vers = PROM_V3; | ||
45 | break; | ||
46 | case 4: | ||
47 | prom_vers = PROM_P1275; | ||
48 | prom_printf("PROMLIB: Sun IEEE Prom not supported yet\n"); | ||
49 | prom_halt(); | ||
50 | break; | ||
51 | default: | ||
52 | prom_printf("PROMLIB: Bad PROM version %d\n", | ||
53 | romvec->pv_romvers); | ||
54 | prom_halt(); | ||
55 | break; | ||
56 | }; | ||
57 | |||
58 | prom_rev = romvec->pv_plugin_revision; | ||
59 | prom_prev = romvec->pv_printrev; | ||
60 | prom_nodeops = romvec->pv_nodeops; | ||
61 | |||
62 | prom_root_node = prom_getsibling(0); | ||
63 | if((prom_root_node == 0) || (prom_root_node == -1)) | ||
64 | prom_halt(); | ||
65 | |||
66 | if((((unsigned long) prom_nodeops) == 0) || | ||
67 | (((unsigned long) prom_nodeops) == -1)) | ||
68 | prom_halt(); | ||
69 | |||
70 | prom_meminit(); | ||
71 | |||
72 | prom_ranges_init(); | ||
73 | #endif | ||
74 | // printk("PROMLIB: Sun Boot Prom Version %d Revision %d\n", | ||
75 | // romvec->pv_romvers, prom_rev); | ||
76 | 32 | ||
77 | /* Initialization successful. */ | 33 | /* Initialization successful. */ |
78 | return; | 34 | return; |