From: Hendrik Brueckner Date: Mon, 13 Oct 2008 23:12:52 +0000 (+0000) Subject: hvc_console: Remove __devexit annotation of hvc_remove() X-Git-Tag: MMI-PSA29.97-13-9~31159^2~6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=934752d8a4aaae4bee7a1b46944f30a55178ec91;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Hendrik Brueckner Signed-off-by: Benjamin Herrenschmidt --- 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, } EXPORT_SYMBOL_GPL(hvc_alloc); -int __devexit hvc_remove(struct hvc_struct *hp) +int hvc_remove(struct hvc_struct *hp) { unsigned long flags; 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); extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int data, struct hv_ops *ops, int outbuf_size); /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ -extern int __devexit hvc_remove(struct hvc_struct *hp); +extern int hvc_remove(struct hvc_struct *hp); /* data available */ int hvc_poll(struct hvc_struct *hp);