Skip to contentSkip to conversation

staging: vme: fix section mismatches in linux-next 20120314

PATCH In review Gerard Snitselaar 2 participants 2 messages Mar 15, 2012 – Mar 16, 2012 Staging

lore
Share & tools
lore

Gerard Snitselaar

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 drivers/staging/vme/devices/vme_pio2.h      |    4 ++--
 drivers/staging/vme/devices/vme_pio2_gpio.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/vme/devices/vme_pio2.h +2 -2
index 3c59313..72d9ce0 100644
@@ -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_ */
drivers/staging/vme/devices/vme_pio2_gpio.c +2 -2
index dc837de..8584849 100644
@@ -187,7 +187,7 @@ int pio2_gpio_reset(struct pio2_card *card)
 	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_card *card)
 	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;
Signature · 1 line
1.7.7.6
#1 lore raw
Quoted 6 lines · Gerard Snitselaar

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 <[email protected]>

I was just about to ack that and realised that Greg's already applied it :-)

Good catch, thanks,

Martyn

Quoted 41 lines
---
 drivers/staging/vme/devices/vme_pio2.h      |    4 ++--
 drivers/staging/vme/devices/vme_pio2_gpio.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/vme/devices/vme_pio2.h +2 -2
index 3c59313..72d9ce0 100644
@@ -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_ */
drivers/staging/vme/devices/vme_pio2_gpio.c +2 -2
index dc837de..8584849 100644
@@ -187,7 +187,7 @@ int pio2_gpio_reset(struct pio2_card *card)
 	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_card *card)
 	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;
Signature · 4 lines
Martyn Welch (Lead Software Engineer)  | Registered in England and Wales
GE Intelligent Platforms               | (3828642) at 100 Barbirolli Square
T +44(0)1327322748                     | Manchester, M2 3AB
E [email protected]                  | VAT:GB 927559189