diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-17 09:13:05 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-17 11:52:48 -0500 |
| commit | d3185b37df05e9ad7ce987a9a0419ffe1af9d23f (patch) | |
| tree | dd9fcbbfe1dfe511b9995f19e73602e4bd92355c | |
| parent | b9e0d1aa9767707cad24db32d8ce0409df16d491 (diff) | |
x86, es7000: remove externs
Impact: cleanup
In the subarch times there were a number of externs between
various bits of the ES7000 code. Now that there's a single
es7000-platform support file, the externs can be removed and
the functions can be changed the statics.
Beyond the cleanup factor, this also shrinks the size of the
kernel image a bit:
arch/x86/kernel/es7000_32.o:
text data bss dec hex filename
2813 192 44 3049 be9 es7000_32.o.before
2693 192 44 2929 b71 es7000_32.o.after
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/es7000_32.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/arch/x86/kernel/es7000_32.c b/arch/x86/kernel/es7000_32.c index 8a20866b2a39..d5c3894a9835 100644 --- a/arch/x86/kernel/es7000_32.c +++ b/arch/x86/kernel/es7000_32.c | |||
| @@ -116,8 +116,6 @@ struct oem_table { | |||
| 116 | u32 OEMTableSize; | 116 | u32 OEMTableSize; |
| 117 | }; | 117 | }; |
| 118 | 118 | ||
| 119 | extern int find_unisys_acpi_oem_table(unsigned long *oem_addr); | ||
| 120 | extern void unmap_unisys_acpi_oem_table(unsigned long oem_addr); | ||
| 121 | #endif | 119 | #endif |
| 122 | 120 | ||
| 123 | struct mip_reg { | 121 | struct mip_reg { |
| @@ -140,12 +138,6 @@ struct mip_reg { | |||
| 140 | 138 | ||
| 141 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) | 139 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) |
| 142 | 140 | ||
| 143 | extern void es7000_enable_apic_mode(void); | ||
| 144 | extern int parse_unisys_oem (char *oemptr); | ||
| 145 | extern int find_unisys_acpi_oem_table(unsigned long *oem_addr); | ||
| 146 | extern void unmap_unisys_acpi_oem_table(unsigned long oem_addr); | ||
| 147 | extern void setup_unisys(void); | ||
| 148 | |||
| 149 | /* | 141 | /* |
| 150 | * ES7000 Globals | 142 | * ES7000 Globals |
| 151 | */ | 143 | */ |
| @@ -215,7 +207,7 @@ static int __init es7000_update_genapic(void) | |||
| 215 | return 0; | 207 | return 0; |
| 216 | } | 208 | } |
| 217 | 209 | ||
| 218 | void __init setup_unisys(void) | 210 | static void __init setup_unisys(void) |
| 219 | { | 211 | { |
| 220 | /* | 212 | /* |
| 221 | * Determine the generation of the ES7000 currently running. | 213 | * Determine the generation of the ES7000 currently running. |
| @@ -234,10 +226,9 @@ void __init setup_unisys(void) | |||
| 234 | } | 226 | } |
| 235 | 227 | ||
| 236 | /* | 228 | /* |
| 237 | * Parse the OEM Table | 229 | * Parse the OEM Table: |
| 238 | */ | 230 | */ |
| 239 | 231 | static int __init parse_unisys_oem (char *oemptr) | |
| 240 | int __init parse_unisys_oem (char *oemptr) | ||
| 241 | { | 232 | { |
| 242 | int i; | 233 | int i; |
| 243 | int success = 0; | 234 | int success = 0; |
| @@ -290,9 +281,9 @@ int __init parse_unisys_oem (char *oemptr) | |||
| 290 | tp += size; | 281 | tp += size; |
| 291 | } | 282 | } |
| 292 | 283 | ||
| 293 | if (success < 2) { | 284 | if (success < 2) |
| 294 | es7000_plat = NON_UNISYS; | 285 | es7000_plat = NON_UNISYS; |
| 295 | } else | 286 | else |
| 296 | setup_unisys(); | 287 | setup_unisys(); |
| 297 | 288 | ||
| 298 | return es7000_plat; | 289 | return es7000_plat; |
| @@ -303,7 +294,7 @@ int __init parse_unisys_oem (char *oemptr) | |||
| 303 | static unsigned long oem_addrX; | 294 | static unsigned long oem_addrX; |
| 304 | static unsigned long oem_size; | 295 | static unsigned long oem_size; |
| 305 | 296 | ||
| 306 | int __init find_unisys_acpi_oem_table(unsigned long *oem_addr) | 297 | static int __init find_unisys_acpi_oem_table(unsigned long *oem_addr) |
| 307 | { | 298 | { |
| 308 | struct acpi_table_header *header = NULL; | 299 | struct acpi_table_header *header = NULL; |
| 309 | int i = 0; | 300 | int i = 0; |
| @@ -326,7 +317,7 @@ int __init find_unisys_acpi_oem_table(unsigned long *oem_addr) | |||
| 326 | return -1; | 317 | return -1; |
| 327 | } | 318 | } |
| 328 | 319 | ||
| 329 | void __init unmap_unisys_acpi_oem_table(unsigned long oem_addr) | 320 | static void __init unmap_unisys_acpi_oem_table(unsigned long oem_addr) |
| 330 | { | 321 | { |
| 331 | if (!oem_addr) | 322 | if (!oem_addr) |
| 332 | return; | 323 | return; |
| @@ -377,7 +368,7 @@ es7000_mip_write(struct mip_reg *mip_reg) | |||
| 377 | return status; | 368 | return status; |
| 378 | } | 369 | } |
| 379 | 370 | ||
| 380 | void __init es7000_enable_apic_mode(void) | 371 | static void __init es7000_enable_apic_mode(void) |
| 381 | { | 372 | { |
| 382 | struct mip_reg es7000_mip_reg; | 373 | struct mip_reg es7000_mip_reg; |
| 383 | int mip_status; | 374 | int mip_status; |
| @@ -706,9 +697,9 @@ static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id) | |||
| 706 | check_dsdt = es7000_check_dsdt(); | 697 | check_dsdt = es7000_check_dsdt(); |
| 707 | 698 | ||
| 708 | if (!find_unisys_acpi_oem_table(&oem_addr)) { | 699 | if (!find_unisys_acpi_oem_table(&oem_addr)) { |
| 709 | if (check_dsdt) | 700 | if (check_dsdt) { |
| 710 | ret = parse_unisys_oem((char *)oem_addr); | 701 | ret = parse_unisys_oem((char *)oem_addr); |
| 711 | else { | 702 | } else { |
| 712 | setup_unisys(); | 703 | setup_unisys(); |
| 713 | ret = 1; | 704 | ret = 1; |
| 714 | } | 705 | } |
