Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a50156a authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

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: default avatarJan Beulich <jbeulich@novell.com>
LKML-Reference: <49B91103.76E4.0078.0@novell.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent dc9dd5cc

arch/x86/kernel/early_printk.c

+10 −10
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static int dbgp_wait_until_complete(void) 
	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;
@@ -311,7 +311,7 @@ static void dbgp_set_data(const void *buf, int size) 
	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;

	u32 lo, hi;
@@ -355,7 +355,7 @@ static int dbgp_bulk_write(unsigned devnum, unsigned endpoint, 
	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)

{

	u32 pids, addr, ctrl;
@@ -386,8 +386,8 @@ static int dbgp_bulk_read(unsigned devnum, unsigned endpoint, void *data, 
	return ret;

}



static int dbgp_control_msg(unsigned devnum, int requesttype, int request,

	int value, int index, void *data, int size)

static int __init dbgp_control_msg(unsigned devnum, int requesttype,

	int request, int value, int index, void *data, int size)

{

	u32 pids, addr, ctrl;

	struct usb_ctrlrequest req;
@@ -489,7 +489,7 @@ static u32 __init find_dbgp(int ehci_num, u32 *rbus, u32 *rslot, u32 *rfunc) 
	return 0;

}



static int ehci_reset_port(int port)

static int __init ehci_reset_port(int port)

{

	u32 portsc;

	u32 delay_time, delay;
@@ -532,7 +532,7 @@ static int ehci_reset_port(int port) 
	return -EBUSY;

}



static int ehci_wait_for_port(int port)

static int __init ehci_wait_for_port(int port)

{

	u32 status;

	int ret, reps;
@@ -557,13 +557,13 @@ static inline void dbgp_printk(const char *fmt, ...) { } 


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;

	dword = read_pci_config(ehci_dev.bus, ehci_dev.slot, ehci_dev.func,