Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86: properly __init-annotate recent early_printk additions

Browse source 
Impact: cleanup, save memory

Don't keep code resident that's only needed during startup.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
LKML-Reference: <49B91103.76E4.0078.0@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Jan Beulich 2009-03-12 12:41:23 +00:00 committed by Ingo Molnar
parent dc9dd5cc85
commit 9a50156a1c
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
arch/x86/kernel/early_printk.c
View file

@ -250,7 +250,7 @@ static int dbgp_wait_until_complete(void)
return (ctrl & DBGP_ERROR) ? -DBGP_ERRCODE(ctrl) : DBGP_LEN(ctrl); return (ctrl & DBGP_ERROR) ? -DBGP_ERRCODE(ctrl) : DBGP_LEN(ctrl);
} }
static void dbgp_mdelay(int ms) static void __init dbgp_mdelay(int ms)
{ {
int i; int i;
@ -311,7 +311,7 @@ static void dbgp_set_data(const void *buf, int size)
writel(hi, &ehci_debug->data47); writel(hi, &ehci_debug->data47);
} }
static void dbgp_get_data(void *buf, int size) static void __init dbgp_get_data(void *buf, int size)
{ {
unsigned char *bytes = buf; unsigned char *bytes = buf;
u32 lo, hi; u32 lo, hi;
@ -355,7 +355,7 @@ static int dbgp_bulk_write(unsigned devnum, unsigned endpoint,
return ret; return ret;
} }
static int dbgp_bulk_read(unsigned devnum, unsigned endpoint, void *data, static int __init dbgp_bulk_read(unsigned devnum, unsigned endpoint, void *data,
int size) int size)
{ {
u32 pids, addr, ctrl; u32 pids, addr, ctrl;
@ -386,8 +386,8 @@ static int dbgp_bulk_read(unsigned devnum, unsigned endpoint, void *data,
return ret; return ret;
} }
static int dbgp_control_msg(unsigned devnum, int requesttype, int request, static int __init dbgp_control_msg(unsigned devnum, int requesttype,
int value, int index, void *data, int size) int request, int value, int index, void *data, int size)
{ {
u32 pids, addr, ctrl; u32 pids, addr, ctrl;
struct usb_ctrlrequest req; struct usb_ctrlrequest req;
@ -489,7 +489,7 @@ static u32 __init find_dbgp(int ehci_num, u32 *rbus, u32 *rslot, u32 *rfunc)
return 0; return 0;
} }
static int ehci_reset_port(int port) static int __init ehci_reset_port(int port)
{ {
u32 portsc; u32 portsc;
u32 delay_time, delay; u32 delay_time, delay;
@ -532,7 +532,7 @@ static int ehci_reset_port(int port)
return -EBUSY; return -EBUSY;
} }
static int ehci_wait_for_port(int port) static int __init ehci_wait_for_port(int port)
{ {
u32 status; u32 status;
int ret, reps; int ret, reps;
@ -557,13 +557,13 @@ static inline void dbgp_printk(const char *fmt, ...) { }
typedef void (*set_debug_port_t)(int port); typedef void (*set_debug_port_t)(int port);
static void default_set_debug_port(int port) static void __init default_set_debug_port(int port)
{ {
} }
static set_debug_port_t set_debug_port = default_set_debug_port; static set_debug_port_t __initdata set_debug_port = default_set_debug_port;
static void nvidia_set_debug_port(int port) static void __init nvidia_set_debug_port(int port)
{ {
u32 dword; u32 dword;
dword = read_pci_config(ehci_dev.bus, ehci_dev.slot, ehci_dev.func, dword = read_pci_config(ehci_dev.bus, ehci_dev.slot, ehci_dev.func,