diff options
| author | Mathias Krause <minipli@googlemail.com> | 2014-08-25 23:26:39 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-24 06:46:27 -0600 |
| commit | 615f77511e4fafa9e67a5b84d8d886dde4f297df (patch) | |
| tree | 3a4e1a5bf08d6b365df3233c63b04f06f3e3c84d /arch/x86/pci/pcbios.c | |
| parent | 6af13bac777aaec7460475a9fea8e9640c4b606e (diff) | |
| download | blackbird-obmc-linux-615f77511e4fafa9e67a5b84d8d886dde4f297df.tar.gz blackbird-obmc-linux-615f77511e4fafa9e67a5b84d8d886dde4f297df.zip | |
x86/PCI: Mark PCI BIOS initialization code as such
The pci_find_bios() function is only ever called from initialization code,
therefore can be marked as such, too. This, in turn, allows marking other
functions called only in this context as well.
The bios32_indirect variable can be marked as __initdata as it is only
referenced from __init functions now.
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/pci/pcbios.c')
| -rw-r--r-- | arch/x86/pci/pcbios.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c index c77b24a8b2da..9b83b9051ae7 100644 --- a/arch/x86/pci/pcbios.c +++ b/arch/x86/pci/pcbios.c @@ -79,13 +79,13 @@ union bios32 { static struct { unsigned long address; unsigned short segment; -} bios32_indirect = { 0, __KERNEL_CS }; +} bios32_indirect __initdata = { 0, __KERNEL_CS }; /* * Returns the entry point for the given service, NULL on error */ -static unsigned long bios32_service(unsigned long service) +static unsigned long __init bios32_service(unsigned long service) { unsigned char return_code; /* %al */ unsigned long address; /* %ebx */ @@ -124,7 +124,7 @@ static struct { static int pci_bios_present; -static int check_pcibios(void) +static int __init check_pcibios(void) { u32 signature, eax, ebx, ecx; u8 status, major_ver, minor_ver, hw_mech; @@ -312,7 +312,7 @@ static const struct pci_raw_ops pci_bios_access = { * Try to find PCI BIOS. */ -static const struct pci_raw_ops *pci_find_bios(void) +static const struct pci_raw_ops *__init pci_find_bios(void) { union bios32 *check; unsigned char sum; |
