Skip to contentSkip to conversation

au88x0: clean up __devinit/__devexit

PATCH In review Dale Sedivec 4 participants 5 messages Apr 9, 2006 – Apr 10, 2006 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 au88x0: clean up __devinit/__devexit

Removed all use of __devinit/__devexit and init.h from headers. Any attributes given in the prototype but not in the function definition have been moved to the definition.

An exception is vortex_eq_free: I removed the __devexit attribute because vortex_eq_free is called from vortex_core_shutdown, and vortex_core_shutdown may be called from __devinit snd_vortex_create.

Compile tested with allyesconfig and allmodconfig.

---

Patches against 2.6.16, applies (with fuzz) against ALSA CVS.

These fixes originated as part of a Kernel Janitors task [1]. Patch originally sent to kernel-janitors mailing list, resent here after it was suggested that any patches against ALSA must be made through alsa-devel [2].

[1] http://www.kerneljanitors.org/TODO
[2] http://lists.osdl.org/pipermail/kernel-janitors/2006-April/006193.html

 sound/pci/au88x0/au88x0.h      |   13 ++++++-------
 sound/pci/au88x0/au88x0_core.c |    2 +-
 sound/pci/au88x0/au88x0_eq.c   |    2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)
sound/pci/au88x0/au88x0.h +6 -7
index c2ad267..b115dba 100644
@@ -19,7 +19,6 @@
 
 #ifdef __KERNEL__
 #include <sound/driver.h>
-#include <linux/init.h>
 #include <linux/pci.h>
 #include <asm/io.h>
 #include <sound/core.h>
@@ -277,14 +276,14 @@ static void vortex_Vort3D_InitializeSour
 #endif
 
 /* Driver stuff. */
-static int __devinit vortex_gameport_register(vortex_t * card);
+static int vortex_gameport_register(vortex_t * card);
 static void vortex_gameport_unregister(vortex_t * card);
 #ifndef CHIP_AU8820
-static int __devinit vortex_eq_init(vortex_t * vortex);
-static int __devexit vortex_eq_free(vortex_t * vortex);
+static int vortex_eq_init(vortex_t * vortex);
+static int vortex_eq_free(vortex_t * vortex);
 #endif
 /* ALSA stuff. */
-static int __devinit snd_vortex_new_pcm(vortex_t * vortex, int idx, int nr);
-static int __devinit snd_vortex_mixer(vortex_t * vortex);
-static int __devinit snd_vortex_midi(vortex_t * vortex);
+static int snd_vortex_new_pcm(vortex_t * vortex, int idx, int nr);
+static int snd_vortex_mixer(vortex_t * vortex);
+static int snd_vortex_midi(vortex_t * vortex);
 #endif
sound/pci/au88x0/au88x0_core.c +1 -1
index e3394fe..5958945 100644
@@ -2658,7 +2658,7 @@ static void vortex_spdif_init(vortex_t *
 
 /* Initialization */
 
-static int vortex_core_init(vortex_t * vortex)
+static int __devinit vortex_core_init(vortex_t * vortex)
 {
 
 	printk(KERN_INFO "Vortex: init.... ");
sound/pci/au88x0/au88x0_eq.c +1 -1
index c8280f8..6c3f636 100644
@@ -886,7 +886,7 @@ static char *EqBandLabels[10] __devinitd
 };
 
 /* ALSA driver entry points. Init and exit. */
-static int vortex_eq_init(vortex_t * vortex)
+static int __devinit vortex_eq_init(vortex_t * vortex)
 {
 	struct snd_kcontrol *kcontrol;
 	int err, i;

-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642

#1 lore raw

At Sat, 8 Apr 2006 20:40:19 -0400,

Quoted 5 lines · Dale Sedivec

Removed all use of __devinit/__devexit and init.h from headers. Any attributes given in the prototype but not in the function definition have been moved to the definition.

Quoted 7 lines

An exception is vortex_eq_free: I removed the __devexit attribute because vortex_eq_free is called from vortex_core_shutdown, and vortex_core_shutdown may be called from __devinit snd_vortex_create.

Compile tested with allyesconfig and allmodconfig.

Thanks, I applied the patch to ALSA cvs tree.

Takashi

-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642

#2 lore raw
Quoted 11 lines · Takashi Iwai

At Sat, 8 Apr 2006 20:40:19 -0400,

Quoted 8 lines · Dale Sedivec

Removed all use of __devinit/__devexit and init.h from headers. Any attributes given in the prototype but not in the function definition have been moved to the definition.

An exception is vortex_eq_free: I removed the __devexit attribute because vortex_eq_free is called from vortex_core_shutdown, and vortex_core_shutdown may be called from __devinit snd_vortex_create.

Quoted 5 lines
Quoted 3 lines

Compile tested with allyesconfig and allmodconfig.

Thanks, I applied the patch to ALSA cvs tree.

what about all the other changes, bugfixes and patches that have been posted on this list? are they being applies as well? (also, that gigantic bugreport and all changes being submitted there...)

Signature · 8 lines
Alien is my name and head-biting is my game


-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
#3 lore raw

At Mon, 10 Apr 2006 13:38:34 +0200,

Quoted 15 lines · Alien
Quoted 13 lines · Takashi Iwai

At Sat, 8 Apr 2006 20:40:19 -0400,

Quoted 10 lines · Dale Sedivec

Removed all use of __devinit/__devexit and init.h from headers. Any attributes given in the prototype but not in the function definition have been moved to the definition.

An exception is vortex_eq_free: I removed the __devexit attribute because vortex_eq_free is called from vortex_core_shutdown, and vortex_core_shutdown may be called from __devinit snd_vortex_create.

Compile tested with allyesconfig and allmodconfig.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Thanks, I applied the patch to ALSA cvs tree.

what about all the other changes, bugfixes and patches that have been posted on this list? are they being applies as well? (also, that gigantic bugreport and all changes being submitted there...)

I have never received any patches on alsa-devel ML.

Could yout _post_ the patches (not a URL, preferably a series of separated patches) to alsa-develML and Cc to me for review and merge? Also don't forget to add a proper changelog and signed-off-by for each patch.

Thanks,

Takashi

-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642

#4 lore raw
In reply to Alien
Quoted 4 lines · Alien

what about all the other changes, bugfixes and patches that have been posted on this list? are they being applies as well? (also, that gigantic bugreport and all changes being submitted there...)

Takashi-san and I have told "Raymond" over and over and over to send patches to the alsa-devel mailing list and NOT to post them to the bug tracker, but he just ignores our advice. Maybe you can get him to listen to reason.

Lee

-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642