[alsa-devel] [PATCH] ALSA: Add missing __devexit_p() markers

[Takashi Iwai]

At Thu, 4 Jun 2009 10:46:43 +0200,
Jean Delvare wrote:
> 
> 3 ISA sound drivers lack their __devexit_p() markers, which would
> cause build failures when the kernel is built without hotplug support.
> 
> Signed-off-by: Jean Delvare <khali at linux-fr.org>
> Cc: Kyle McMartin <kyle at mcmartin.ca>
> Cc: Takashi Iwai <tiwai at suse.de>

Applied now.  Thanks!


Takashi

> ---
>  sound/isa/es1688/es1688.c  |    2 +-
>  sound/isa/gus/gusextreme.c |    2 +-
>  sound/parisc/harmony.c     |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> --- linux-2.6.30-rc8.orig/sound/isa/es1688/es1688.c	2009-04-08 08:54:02.000000000 +0200
> +++ linux-2.6.30-rc8/sound/isa/es1688/es1688.c	2009-06-04 10:37:06.000000000 +0200
> @@ -193,7 +193,7 @@ static int __devexit snd_es1688_remove(s
>  static struct isa_driver snd_es1688_driver = {
>  	.match		= snd_es1688_match,
>  	.probe		= snd_es1688_probe,
> -	.remove		= snd_es1688_remove,
> +	.remove		= __devexit_p(snd_es1688_remove),
>  #if 0	/* FIXME */
>  	.suspend	= snd_es1688_suspend,
>  	.resume		= snd_es1688_resume,
> --- linux-2.6.30-rc8.orig/sound/isa/gus/gusextreme.c	2009-04-08 08:54:02.000000000 +0200
> +++ linux-2.6.30-rc8/sound/isa/gus/gusextreme.c	2009-06-04 10:37:13.000000000 +0200
> @@ -348,7 +348,7 @@ static int __devexit snd_gusextreme_remo
>  static struct isa_driver snd_gusextreme_driver = {
>  	.match		= snd_gusextreme_match,
>  	.probe		= snd_gusextreme_probe,
> -	.remove		= snd_gusextreme_remove,
> +	.remove		= __devexit_p(snd_gusextreme_remove),
>  #if 0	/* FIXME */
>  	.suspend	= snd_gusextreme_suspend,
>  	.resume		= snd_gusextreme_resume,
> --- linux-2.6.30-rc8.orig/sound/parisc/harmony.c	2009-04-08 08:54:03.000000000 +0200
> +++ linux-2.6.30-rc8/sound/parisc/harmony.c	2009-06-04 10:37:25.000000000 +0200
> @@ -1020,7 +1020,7 @@ static struct parisc_driver snd_harmony_
>  	.name = "harmony",
>  	.id_table = snd_harmony_devtable,
>  	.probe = snd_harmony_probe,
> -	.remove = snd_harmony_remove,
> +	.remove = __devexit_p(snd_harmony_remove),
>  };
>  
>  static int __init 
> 
> 
> -- 
> Jean Delvare
>