diff options
author | Jan Beulich <jbeulich@novell.com> | 2009-03-12 08:41:23 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 21:37:18 -0400 |
commit | 9a50156a1c7bfa65315facaffdfbed6513fcfd3b (patch) | |
tree | 33c92384b9cb569d5900b876fd3968f2862c9fbf /arch/x86/kernel/early_printk.c | |
parent | dc9dd5cc854cde110d2421f3a11fec7597e059c1 (diff) |
x86: properly __init-annotate recent early_printk additions
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>
Diffstat (limited to 'arch/x86/kernel/early_printk.c')
-rw-r--r-- | arch/x86/kernel/early_printk.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c index 639ad98238a2..335f049d110f 100644 --- a/arch/x86/kernel/early_printk.c +++ b/arch/x86/kernel/early_printk.c | |||
@@ -250,7 +250,7 @@ static int dbgp_wait_until_complete(void) | |||
250 | return (ctrl & DBGP_ERROR) ? -DBGP_ERRCODE(ctrl) : DBGP_LEN(ctrl); | 250 | return (ctrl & DBGP_ERROR) ? -DBGP_ERRCODE(ctrl) : DBGP_LEN(ctrl); |
251 | } | 251 | } |
252 | 252 | ||
253 | static void dbgp_mdelay(int ms) | 253 | static void __init dbgp_mdelay(int ms) |
254 | { | 254 | { |
255 | int i; | 255 | int i; |
256 | 256 | ||
@@ -311,7 +311,7 @@ static void dbgp_set_data(const void *buf, int size) | |||
311 | writel(hi, &ehci_debug->data47); | 311 | writel(hi, &ehci_debug->data47); |
312 | } | 312 | } |
313 | 313 | ||
314 | static void dbgp_get_data(void *buf, int size) | 314 | static void __init dbgp_get_data(void *buf, int size) |
315 | { | 315 | { |
316 | unsigned char *bytes = buf; | 316 | unsigned char *bytes = buf; |
317 | u32 lo, hi; | 317 | u32 lo, hi; |
@@ -355,7 +355,7 @@ static int dbgp_bulk_write(unsigned devnum, unsigned endpoint, | |||
355 | return ret; | 355 | return ret; |
356 | } | 356 | } |
357 | 357 | ||
358 | static int dbgp_bulk_read(unsigned devnum, unsigned endpoint, void *data, | 358 | static int __init dbgp_bulk_read(unsigned devnum, unsigned endpoint, void *data, |
359 | int size) | 359 | int size) |
360 | { | 360 | { |
361 | u32 pids, addr, ctrl; | 361 | u32 pids, addr, ctrl; |
@@ -386,8 +386,8 @@ static int dbgp_bulk_read(unsigned devnum, unsigned endpoint, void *data, | |||
386 | return ret; | 386 | return ret; |
387 | } | 387 | } |
388 | 388 | ||
389 | static int dbgp_control_msg(unsigned devnum, int requesttype, int request, | 389 | static int __init dbgp_control_msg(unsigned devnum, int requesttype, |
390 | int value, int index, void *data, int size) | 390 | int request, int value, int index, void *data, int size) |
391 | { | 391 | { |
392 | u32 pids, addr, ctrl; | 392 | u32 pids, addr, ctrl; |
393 | struct usb_ctrlrequest req; | 393 | struct usb_ctrlrequest req; |
@@ -489,7 +489,7 @@ static u32 __init find_dbgp(int ehci_num, u32 *rbus, u32 *rslot, u32 *rfunc) | |||
489 | return 0; | 489 | return 0; |
490 | } | 490 | } |
491 | 491 | ||
492 | static int ehci_reset_port(int port) | 492 | static int __init ehci_reset_port(int port) |
493 | { | 493 | { |
494 | u32 portsc; | 494 | u32 portsc; |
495 | u32 delay_time, delay; | 495 | u32 delay_time, delay; |
@@ -532,7 +532,7 @@ static int ehci_reset_port(int port) | |||
532 | return -EBUSY; | 532 | return -EBUSY; |
533 | } | 533 | } |
534 | 534 | ||
535 | static int ehci_wait_for_port(int port) | 535 | static int __init ehci_wait_for_port(int port) |
536 | { | 536 | { |
537 | u32 status; | 537 | u32 status; |
538 | int ret, reps; | 538 | int ret, reps; |
@@ -557,13 +557,13 @@ static inline void dbgp_printk(const char *fmt, ...) { } | |||
557 | 557 | ||
558 | typedef void (*set_debug_port_t)(int port); | 558 | typedef void (*set_debug_port_t)(int port); |
559 | 559 | ||
560 | static void default_set_debug_port(int port) | 560 | static void __init default_set_debug_port(int port) |
561 | { | 561 | { |
562 | } | 562 | } |
563 | 563 | ||
564 | static set_debug_port_t set_debug_port = default_set_debug_port; | 564 | static set_debug_port_t __initdata set_debug_port = default_set_debug_port; |
565 | 565 | ||
566 | static void nvidia_set_debug_port(int port) | 566 | static void __init nvidia_set_debug_port(int port) |
567 | { | 567 | { |
568 | u32 dword; | 568 | u32 dword; |
569 | dword = read_pci_config(ehci_dev.bus, ehci_dev.slot, ehci_dev.func, | 569 | dword = read_pci_config(ehci_dev.bus, ehci_dev.slot, ehci_dev.func, |