diff options
author | Gerard Snitselaar <dev@snitselaar.org> | 2012-03-15 04:50:39 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-15 17:04:34 -0400 |
commit | bf3a85be67068a0f55804349e6e1dce80008c45c (patch) | |
tree | a7e6f591f4a3e2fb3befc2dac497d983e50dfb6b | |
parent | dec3a003bd2870caa8769a752a49102776af3a25 (diff) |
staging: vme: fix section mismatches in linux-next 20120314
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 <dev@snitselaar.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/vme/devices/vme_pio2.h | 4 | ||||
-rw-r--r-- | drivers/staging/vme/devices/vme_pio2_gpio.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/vme/devices/vme_pio2.h b/drivers/staging/vme/devices/vme_pio2.h index 3c5931364535..72d9ce0bcb45 100644 --- a/drivers/staging/vme/devices/vme_pio2.h +++ b/drivers/staging/vme/devices/vme_pio2.h | |||
@@ -243,7 +243,7 @@ struct pio2_card { | |||
243 | int pio2_cntr_reset(struct pio2_card *); | 243 | int pio2_cntr_reset(struct pio2_card *); |
244 | 244 | ||
245 | int pio2_gpio_reset(struct pio2_card *); | 245 | int pio2_gpio_reset(struct pio2_card *); |
246 | int __init pio2_gpio_init(struct pio2_card *); | 246 | int __devinit pio2_gpio_init(struct pio2_card *); |
247 | void __exit pio2_gpio_exit(struct pio2_card *); | 247 | void pio2_gpio_exit(struct pio2_card *); |
248 | 248 | ||
249 | #endif /* _VME_PIO2_H_ */ | 249 | #endif /* _VME_PIO2_H_ */ |
diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c index dc837deb99dd..858484915f08 100644 --- 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 *card) | |||
187 | return 0; | 187 | return 0; |
188 | } | 188 | } |
189 | 189 | ||
190 | int __init pio2_gpio_init(struct pio2_card *card) | 190 | int __devinit pio2_gpio_init(struct pio2_card *card) |
191 | { | 191 | { |
192 | int retval = 0; | 192 | int retval = 0; |
193 | char *label; | 193 | char *label; |
@@ -220,7 +220,7 @@ int __init pio2_gpio_init(struct pio2_card *card) | |||
220 | return retval; | 220 | return retval; |
221 | }; | 221 | }; |
222 | 222 | ||
223 | void __exit pio2_gpio_exit(struct pio2_card *card) | 223 | void pio2_gpio_exit(struct pio2_card *card) |
224 | { | 224 | { |
225 | const char *label = card->gc.label; | 225 | const char *label = card->gc.label; |
226 | 226 | ||