[ 021/175] staging: vme: fix section mismatches in linux-next 20120314
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2012-03-30 21:18:08
Also in:
lkml
3.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Gerard Snitselaar <redacted> commit bf3a85be67068a0f55804349e6e1dce80008c45c upstream. pio2_gpio_init() annotated with __init, but called by pio2_probe() which is annotated __devinit. pio2_gpio_exit() is annotated __exit, but is called by pio2_probe() and by pio2_remove() which is annotated __devexit. Signed-off-by: Gerard Snitselaar <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/staging/vme/devices/vme_pio2.h | 4 ++-- drivers/staging/vme/devices/vme_pio2_gpio.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
--- a/drivers/staging/vme/devices/vme_pio2.h
+++ b/drivers/staging/vme/devices/vme_pio2.h@@ -243,7 +243,7 @@ struct pio2_card { int pio2_cntr_reset(struct pio2_card *); int pio2_gpio_reset(struct pio2_card *); -int __init pio2_gpio_init(struct pio2_card *); -void __exit pio2_gpio_exit(struct pio2_card *); +int __devinit pio2_gpio_init(struct pio2_card *); +void pio2_gpio_exit(struct pio2_card *); #endif /* _VME_PIO2_H_ */ --- a/drivers/staging/vme/devices/vme_pio2_gpio.c +++ b/drivers/staging/vme/devices/vme_pio2_gpio.c
@@ -187,7 +187,7 @@ int pio2_gpio_reset(struct pio2_card *ca return 0; } -int __init pio2_gpio_init(struct pio2_card *card) +int __devinit pio2_gpio_init(struct pio2_card *card) { int retval = 0; char *label;
@@ -220,7 +220,7 @@ int __init pio2_gpio_init(struct pio2_ca return retval; }; -void __exit pio2_gpio_exit(struct pio2_card *card) +void pio2_gpio_exit(struct pio2_card *card) { const char *label = card->gc.label;