diff options
author | Amit Shah <amit.shah@redhat.com> | 2010-01-17 22:44:58 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-03 01:39:49 -0500 |
commit | 119ea10947cc1402abbf9d6200815b0606536906 (patch) | |
tree | 858219703f4c1ba2a5d9b2570f1edc2bfe0fb45d /drivers/char/hvc_console.c | |
parent | b51130685817d8c1b56386f9957405b5be2cdfe0 (diff) |
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: Amit Shah <amit.shah@redhat.com>
Cc: linuxppc-dev@ozlabs.org
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/char/hvc_console.c')
-rw-r--r-- | drivers/char/hvc_console.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index d8dac5820f0e..4c3b59be286a 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c | |||
@@ -748,9 +748,9 @@ static const struct tty_operations hvc_ops = { | |||
748 | .chars_in_buffer = hvc_chars_in_buffer, | 748 | .chars_in_buffer = hvc_chars_in_buffer, |
749 | }; | 749 | }; |
750 | 750 | ||
751 | struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int data, | 751 | struct hvc_struct *hvc_alloc(uint32_t vtermno, int data, |
752 | const struct hv_ops *ops, | 752 | const struct hv_ops *ops, |
753 | int outbuf_size) | 753 | int outbuf_size) |
754 | { | 754 | { |
755 | struct hvc_struct *hp; | 755 | struct hvc_struct *hp; |
756 | int i; | 756 | int i; |