* [PATCH]: exit_ivtv_i2c() cannot be __devexit
@ 2007-10-31 4:23 David Miller
2007-10-31 8:17 ` Hans Verkuil
0 siblings, 1 reply; 2+ messages in thread
From: David Miller @ 2007-10-31 4:23 UTC (permalink / raw)
To: torvalds; +Cc: hverkuil, linux-kernel
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.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/media/video/ivtv/ivtv-i2c.c | 2 +-
drivers/media/video/ivtv/ivtv-i2c.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index 285fca6..623eea2 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -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");
diff --git a/drivers/media/video/ivtv/ivtv-i2c.h b/drivers/media/video/ivtv/ivtv-i2c.h
index 677c329..de6a074 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.h
+++ b/drivers/media/video/ivtv/ivtv-i2c.h
@@ -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
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH]: exit_ivtv_i2c() cannot be __devexit
2007-10-31 4:23 [PATCH]: exit_ivtv_i2c() cannot be __devexit David Miller
@ 2007-10-31 8:17 ` Hans Verkuil
0 siblings, 0 replies; 2+ messages in thread
From: Hans Verkuil @ 2007-10-31 8:17 UTC (permalink / raw)
To: David Miller; +Cc: torvalds, linux-kernel
On Wednesday 31 October 2007 05:23, David Miller wrote:
> 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!
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Thanks,
Hans
>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> ---
> drivers/media/video/ivtv/ivtv-i2c.c | 2 +-
> drivers/media/video/ivtv/ivtv-i2c.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/video/ivtv/ivtv-i2c.c
> b/drivers/media/video/ivtv/ivtv-i2c.c index 285fca6..623eea2 100644
> --- a/drivers/media/video/ivtv/ivtv-i2c.c
> +++ b/drivers/media/video/ivtv/ivtv-i2c.c
> @@ -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");
>
> diff --git a/drivers/media/video/ivtv/ivtv-i2c.h
> b/drivers/media/video/ivtv/ivtv-i2c.h index 677c329..de6a074 100644
> --- a/drivers/media/video/ivtv/ivtv-i2c.h
> +++ b/drivers/media/video/ivtv/ivtv-i2c.h
> @@ -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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-10-31 8:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-10-31 4:23 [PATCH]: exit_ivtv_i2c() cannot be __devexit David Miller
2007-10-31 8:17 ` Hans Verkuil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®