Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 934752d8a4aaae4bee7a1b46944f30a55178ec91

Authored by Hendrik Brueckner
Committed by Benjamin Herrenschmidt
1 parent febde37119
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

drivers/char/hvc_console.c
Diff comments   View file @ 934752d
... ... @@ -803,7 +803,7 @@
803 803 }
804 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 808 unsigned long flags;
809 809 struct tty_struct *tty;
drivers/char/hvc_console.h
Diff comments   View file @ 934752d
... ... @@ -81,7 +81,7 @@
81 81 extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int data,
82 82 struct hv_ops *ops, int outbuf_size);
83 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 86 /* data available */
87 87 int hvc_poll(struct hvc_struct *hp);