[ALSA] au88x0 - clean up __devinit/__devexit
Modules: au88x0 driver 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. Signed-off-by: Dale Sedivec <dale@codefu.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
a29b6c8895
commit
99e80e4d0c
|
@ -19,7 +19,6 @@
|
||||||
|
|
||||||
#ifdef __KERNEL__
|
#ifdef __KERNEL__
|
||||||
#include <sound/driver.h>
|
#include <sound/driver.h>
|
||||||
#include <linux/init.h>
|
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <sound/core.h>
|
#include <sound/core.h>
|
||||||
|
@ -277,14 +276,14 @@ static void vortex_Vort3D_InitializeSource(a3dsrc_t * a, int en);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Driver stuff. */
|
/* 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);
|
static void vortex_gameport_unregister(vortex_t * card);
|
||||||
#ifndef CHIP_AU8820
|
#ifndef CHIP_AU8820
|
||||||
static int __devinit vortex_eq_init(vortex_t * vortex);
|
static int vortex_eq_init(vortex_t * vortex);
|
||||||
static int __devexit vortex_eq_free(vortex_t * vortex);
|
static int vortex_eq_free(vortex_t * vortex);
|
||||||
#endif
|
#endif
|
||||||
/* ALSA stuff. */
|
/* ALSA stuff. */
|
||||||
static int __devinit snd_vortex_new_pcm(vortex_t * vortex, int idx, int nr);
|
static int snd_vortex_new_pcm(vortex_t * vortex, int idx, int nr);
|
||||||
static int __devinit snd_vortex_mixer(vortex_t * vortex);
|
static int snd_vortex_mixer(vortex_t * vortex);
|
||||||
static int __devinit snd_vortex_midi(vortex_t * vortex);
|
static int snd_vortex_midi(vortex_t * vortex);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -2658,7 +2658,7 @@ static void vortex_spdif_init(vortex_t * vortex, int spdif_sr, int spdif_mode)
|
||||||
|
|
||||||
/* Initialization */
|
/* Initialization */
|
||||||
|
|
||||||
static int vortex_core_init(vortex_t * vortex)
|
static int __devinit vortex_core_init(vortex_t * vortex)
|
||||||
{
|
{
|
||||||
|
|
||||||
printk(KERN_INFO "Vortex: init.... ");
|
printk(KERN_INFO "Vortex: init.... ");
|
||||||
|
|
|
@ -885,7 +885,7 @@ static char *EqBandLabels[10] __devinitdata = {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* ALSA driver entry points. Init and exit. */
|
/* 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;
|
struct snd_kcontrol *kcontrol;
|
||||||
int err, i;
|
int err, i;
|
||||||
|
|
Loading…
Reference in New Issue