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

Commit 119ea109 authored by Amit Shah's avatar Amit Shah Committed by Benjamin Herrenschmidt
Browse files

hvc_console: Remove __devinit annotation from hvc_alloc 



Virtio consoles can be hotplugged, so hvc_alloc gets called from
multiple sites: from the initial probe() routine as well as later on
from workqueue handlers which aren't __devinit code.

So, drop the __devinit annotation for hvc_alloc.

Signed-off-by: default avatarAmit Shah <amit.shah@redhat.com>
Cc: linuxppc-dev@ozlabs.org
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent b5113068

drivers/char/hvc_console.c

+3 −3
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ static const struct tty_operations hvc_ops = { 
	.chars_in_buffer = hvc_chars_in_buffer,

};



struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int data,

struct hvc_struct *hvc_alloc(uint32_t vtermno, int data,

			     const struct hv_ops *ops,

			     int outbuf_size)

{

drivers/char/hvc_console.h

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ extern int hvc_instantiate(uint32_t vtermno, int index, 
			   const struct hv_ops *ops);



/* register a vterm for hvc tty operation (module_init or hotplug add) */

extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int data,

extern struct hvc_struct * hvc_alloc(uint32_t vtermno, int data,

				     const struct hv_ops *ops, int outbuf_size);

/* remove a vterm from hvc tty operation (module_exit or hotplug remove) */

extern int hvc_remove(struct hvc_struct *hp);