diff options
Diffstat (limited to 'arch/powerpc/platforms/85xx/mpc85xx_cds.c')
-rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_cds.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c index 953cd5dd3f54..abc0aca6de40 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c | |||
@@ -56,7 +56,6 @@ unsigned long isa_mem_base = 0; | |||
56 | static int cds_pci_slot = 2; | 56 | static int cds_pci_slot = 2; |
57 | static volatile u8 *cadmus; | 57 | static volatile u8 *cadmus; |
58 | 58 | ||
59 | |||
60 | #ifdef CONFIG_PCI | 59 | #ifdef CONFIG_PCI |
61 | 60 | ||
62 | #define ARCADIA_HOST_BRIDGE_IDSEL 17 | 61 | #define ARCADIA_HOST_BRIDGE_IDSEL 17 |
@@ -64,8 +63,7 @@ static volatile u8 *cadmus; | |||
64 | 63 | ||
65 | extern int mpc85xx_pci2_busno; | 64 | extern int mpc85xx_pci2_busno; |
66 | 65 | ||
67 | int | 66 | static int mpc85xx_exclude_device(u_char bus, u_char devfn) |
68 | mpc85xx_exclude_device(u_char bus, u_char devfn) | ||
69 | { | 67 | { |
70 | if (bus == 0 && PCI_SLOT(devfn) == 0) | 68 | if (bus == 0 && PCI_SLOT(devfn) == 0) |
71 | return PCIBIOS_DEVICE_NOT_FOUND; | 69 | return PCIBIOS_DEVICE_NOT_FOUND; |
@@ -81,8 +79,7 @@ mpc85xx_exclude_device(u_char bus, u_char devfn) | |||
81 | return PCIBIOS_SUCCESSFUL; | 79 | return PCIBIOS_SUCCESSFUL; |
82 | } | 80 | } |
83 | 81 | ||
84 | void __init | 82 | static void __init mpc85xx_cds_pcibios_fixup(void) |
85 | mpc85xx_cds_pcibios_fixup(void) | ||
86 | { | 83 | { |
87 | struct pci_dev *dev; | 84 | struct pci_dev *dev; |
88 | u_char c; | 85 | u_char c; |
@@ -144,7 +141,7 @@ static void mpc85xx_8259_cascade(unsigned int irq, struct irq_desc *desc) | |||
144 | #endif /* PPC_I8259 */ | 141 | #endif /* PPC_I8259 */ |
145 | #endif /* CONFIG_PCI */ | 142 | #endif /* CONFIG_PCI */ |
146 | 143 | ||
147 | void __init mpc85xx_cds_pic_init(void) | 144 | static void __init mpc85xx_cds_pic_init(void) |
148 | { | 145 | { |
149 | struct mpic *mpic; | 146 | struct mpic *mpic; |
150 | struct resource r; | 147 | struct resource r; |
@@ -224,12 +221,10 @@ void __init mpc85xx_cds_pic_init(void) | |||
224 | #endif /* CONFIG_PPC_I8259 */ | 221 | #endif /* CONFIG_PPC_I8259 */ |
225 | } | 222 | } |
226 | 223 | ||
227 | |||
228 | /* | 224 | /* |
229 | * Setup the architecture | 225 | * Setup the architecture |
230 | */ | 226 | */ |
231 | static void __init | 227 | static void __init mpc85xx_cds_setup_arch(void) |
232 | mpc85xx_cds_setup_arch(void) | ||
233 | { | 228 | { |
234 | struct device_node *cpu; | 229 | struct device_node *cpu; |
235 | #ifdef CONFIG_PCI | 230 | #ifdef CONFIG_PCI |
@@ -276,9 +271,7 @@ mpc85xx_cds_setup_arch(void) | |||
276 | #endif | 271 | #endif |
277 | } | 272 | } |
278 | 273 | ||
279 | 274 | static void mpc85xx_cds_show_cpuinfo(struct seq_file *m) | |
280 | void | ||
281 | mpc85xx_cds_show_cpuinfo(struct seq_file *m) | ||
282 | { | 275 | { |
283 | uint pvid, svid, phid1; | 276 | uint pvid, svid, phid1; |
284 | uint memsize = total_memory; | 277 | uint memsize = total_memory; |