Skip to contentSkip to conversation

: exit_ivtv_i2c() cannot be __devexit

PATCH In review David Miller 2 participants 2 messages Oct 31, 2007 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : exit_ivtv_i2c() cannot be __devexit

Please apply, thanks!

[MEDIA] IVTV: exit_ivtv_i2c() cannot be __devexit

It is referenced both from __devinit code (ivtv_probe) and normal .text (ivtv_process_eeprom), and therefore cannot be discarded via __devexit.

---
 drivers/media/video/ivtv/ivtv-i2c.c |    2 +-
 drivers/media/video/ivtv/ivtv-i2c.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/media/video/ivtv/ivtv-i2c.c +1 -1
index 285fca6..623eea2 100644
@@ -741,7 +741,7 @@ int __devinit init_ivtv_i2c(struct ivtv *itv)
 		return i2c_bit_add_bus(&itv->i2c_adap);
 }
 
-void __devexit exit_ivtv_i2c(struct ivtv *itv)
+void exit_ivtv_i2c(struct ivtv *itv)
 {
 	IVTV_DEBUG_I2C("i2c exit\n");
 
drivers/media/video/ivtv/ivtv-i2c.h +1 -1
index 677c329..de6a074 100644
@@ -36,6 +36,6 @@ void ivtv_call_i2c_clients(struct ivtv *itv, unsigned int cmd, void *arg);
 
 /* init + register i2c algo-bit adapter */
 int __devinit init_ivtv_i2c(struct ivtv *itv);
-void __devexit exit_ivtv_i2c(struct ivtv *itv);
+void exit_ivtv_i2c(struct ivtv *itv);
 
 #endif
#1 lore raw
Quoted 7 lines · David Miller

Please apply, thanks!

[MEDIA] IVTV: exit_ivtv_i2c() cannot be __devexit

It is referenced both from __devinit code (ivtv_probe) and normal .text (ivtv_process_eeprom), and therefore cannot be discarded via __devexit.

Good catch!

Thanks,

Hans

Quoted 33 lines
---
 drivers/media/video/ivtv/ivtv-i2c.c |    2 +-
 drivers/media/video/ivtv/ivtv-i2c.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/drivers/media/video/ivtv/ivtv-i2c.c index 285fca6..623eea2 100644

drivers/media/video/ivtv/ivtv-i2c.c +1 -1
@@ -741,7 +741,7 @@ int __devinit init_ivtv_i2c(struct ivtv *itv)
 		return i2c_bit_add_bus(&itv->i2c_adap);
 }
 
-void __devexit exit_ivtv_i2c(struct ivtv *itv)
+void exit_ivtv_i2c(struct ivtv *itv)
 {
 	IVTV_DEBUG_I2C("i2c exit\n");
 
(quoted diff) +0 -0

b/drivers/media/video/ivtv/ivtv-i2c.h index 677c329..de6a074 100644

drivers/media/video/ivtv/ivtv-i2c.h +1 -1
@@ -36,6 +36,6 @@ void ivtv_call_i2c_clients(struct ivtv *itv,
 unsigned int cmd, void *arg);
 
 /* init + register i2c algo-bit adapter */
 int __devinit init_ivtv_i2c(struct ivtv *itv);
-void __devexit exit_ivtv_i2c(struct ivtv *itv);
+void exit_ivtv_i2c(struct ivtv *itv);
 

#endif