diff options
author | Hendrik Brueckner <brueckner@linux.vnet.ibm.com> | 2008-10-13 19:12:52 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 20:00:25 -0400 |
commit | 934752d8a4aaae4bee7a1b46944f30a55178ec91 (patch) | |
tree | fe23b3354bcb6c288f5abaaf841cd9ec813cd20c /drivers/char | |
parent | febde3711992a64ea83a47a719f68a90c4b0927a (diff) |
hvc_console: Remove __devexit annotation of hvc_remove()
Removed __devexit annotation of hvc_remove() to avoid a section mismatch
if the backend initialization fails and hvc_remove() must be used to
clean up allocated hvc structs (called in section __init or __devinit).
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/hvc_console.c | 2 | ||||
-rw-r--r-- | drivers/char/hvc_console.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index 2d256dc80529..5b819b12675a 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c | |||
@@ -803,7 +803,7 @@ struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int data, | |||
803 | } | 803 | } |
804 | EXPORT_SYMBOL_GPL(hvc_alloc); | 804 | EXPORT_SYMBOL_GPL(hvc_alloc); |
805 | 805 | ||
806 | int __devexit hvc_remove(struct hvc_struct *hp) | 806 | int hvc_remove(struct hvc_struct *hp) |
807 | { | 807 | { |
808 | unsigned long flags; | 808 | unsigned long flags; |
809 | struct tty_struct *tty; | 809 | struct tty_struct *tty; |
diff --git a/drivers/char/hvc_console.h b/drivers/char/hvc_console.h index e3359f3c9b2a..8297dbc2e6ec 100644 --- a/drivers/char/hvc_console.h +++ b/drivers/char/hvc_console.h | |||
@@ -81,7 +81,7 @@ extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops); | |||
81 | extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int data, | 81 | extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int data, |
82 | struct hv_ops *ops, int outbuf_size); | 82 | struct hv_ops *ops, int outbuf_size); |
83 | /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ | 83 | /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ |
84 | extern int __devexit hvc_remove(struct hvc_struct *hp); | 84 | extern int hvc_remove(struct hvc_struct *hp); |
85 | 85 | ||
86 | /* data available */ | 86 | /* data available */ |
87 | int hvc_poll(struct hvc_struct *hp); | 87 | int hvc_poll(struct hvc_struct *hp); |