Commit d3185b37 authored by Ingo Molnar's avatar Ingo Molnar

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: default avatarIngo Molnar <mingo@elte.hu>
parent b9e0d1aa
...@@ -116,8 +116,6 @@ struct oem_table { ...@@ -116,8 +116,6 @@ struct oem_table {
u32 OEMTableSize; u32 OEMTableSize;
}; };
extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);
extern void unmap_unisys_acpi_oem_table(unsigned long oem_addr);
#endif #endif
struct mip_reg { struct mip_reg {
...@@ -140,12 +138,6 @@ struct mip_reg { ...@@ -140,12 +138,6 @@ struct mip_reg {
#define APIC_DFR_VALUE (APIC_DFR_FLAT) #define APIC_DFR_VALUE (APIC_DFR_FLAT)
extern void es7000_enable_apic_mode(void);
extern int parse_unisys_oem (char *oemptr);
extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);
extern void unmap_unisys_acpi_oem_table(unsigned long oem_addr);
extern void setup_unisys(void);
/* /*
* ES7000 Globals * ES7000 Globals
*/ */
...@@ -215,7 +207,7 @@ static int __init es7000_update_genapic(void) ...@@ -215,7 +207,7 @@ static int __init es7000_update_genapic(void)
return 0; return 0;
} }
void __init setup_unisys(void) static void __init setup_unisys(void)
{ {
/* /*
* Determine the generation of the ES7000 currently running. * Determine the generation of the ES7000 currently running.
...@@ -234,10 +226,9 @@ void __init setup_unisys(void) ...@@ -234,10 +226,9 @@ void __init setup_unisys(void)
} }
/* /*
* Parse the OEM Table * Parse the OEM Table:
*/ */
static int __init parse_unisys_oem (char *oemptr)
int __init parse_unisys_oem (char *oemptr)
{ {
int i; int i;
int success = 0; int success = 0;
...@@ -290,9 +281,9 @@ int __init parse_unisys_oem (char *oemptr) ...@@ -290,9 +281,9 @@ int __init parse_unisys_oem (char *oemptr)
tp += size; tp += size;
} }
if (success < 2) { if (success < 2)
es7000_plat = NON_UNISYS; es7000_plat = NON_UNISYS;
} else else
setup_unisys(); setup_unisys();
return es7000_plat; return es7000_plat;
...@@ -303,7 +294,7 @@ int __init parse_unisys_oem (char *oemptr) ...@@ -303,7 +294,7 @@ int __init parse_unisys_oem (char *oemptr)
static unsigned long oem_addrX; static unsigned long oem_addrX;
static unsigned long oem_size; static unsigned long oem_size;
int __init find_unisys_acpi_oem_table(unsigned long *oem_addr) static int __init find_unisys_acpi_oem_table(unsigned long *oem_addr)
{ {
struct acpi_table_header *header = NULL; struct acpi_table_header *header = NULL;
int i = 0; int i = 0;
...@@ -326,7 +317,7 @@ int __init find_unisys_acpi_oem_table(unsigned long *oem_addr) ...@@ -326,7 +317,7 @@ int __init find_unisys_acpi_oem_table(unsigned long *oem_addr)
return -1; return -1;
} }
void __init unmap_unisys_acpi_oem_table(unsigned long oem_addr) static void __init unmap_unisys_acpi_oem_table(unsigned long oem_addr)
{ {
if (!oem_addr) if (!oem_addr)
return; return;
...@@ -377,7 +368,7 @@ es7000_mip_write(struct mip_reg *mip_reg) ...@@ -377,7 +368,7 @@ es7000_mip_write(struct mip_reg *mip_reg)
return status; return status;
} }
void __init es7000_enable_apic_mode(void) static void __init es7000_enable_apic_mode(void)
{ {
struct mip_reg es7000_mip_reg; struct mip_reg es7000_mip_reg;
int mip_status; int mip_status;
...@@ -706,9 +697,9 @@ static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id) ...@@ -706,9 +697,9 @@ static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
check_dsdt = es7000_check_dsdt(); check_dsdt = es7000_check_dsdt();
if (!find_unisys_acpi_oem_table(&oem_addr)) { if (!find_unisys_acpi_oem_table(&oem_addr)) {
if (check_dsdt) if (check_dsdt) {
ret = parse_unisys_oem((char *)oem_addr); ret = parse_unisys_oem((char *)oem_addr);
else { } else {
setup_unisys(); setup_unisys();
ret = 1; ret = 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment