| Message ID | 1402325639-2376-1-git-send-email-fabf@skynet.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 9 Jun 2014 16:53:59 +0200 Fabian Frederick <fabf@skynet.be> wrote: > dmasound_init is only called by __init functions: > > __init dmasound_q40_init > __init amiga_audio_probe > __init dmasound_atari_init > > Cc: Jaroslav Kysela <perex@perex.cz> > Cc: Takashi Iwai <tiwai@suse.de> > Signed-off-by: Fabian Frederick <fabf@skynet.be> > --- > sound/oss/dmasound/dmasound.h | 2 +- > sound/oss/dmasound/dmasound_core.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/oss/dmasound/dmasound.h b/sound/oss/dmasound/dmasound.h > index 01019f0..a181ed2 100644 > --- a/sound/oss/dmasound/dmasound.h > +++ b/sound/oss/dmasound/dmasound.h > @@ -86,7 +86,7 @@ static inline int ioctl_return(int __user *addr, int value) > * Initialization > */ > > -extern int dmasound_init(void); > +extern int __init dmasound_init(void); > #ifdef MODULE > extern void dmasound_deinit(void); > #else > diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c > index f4ee85a..1f0a42c 100644 > --- a/sound/oss/dmasound/dmasound_core.c > +++ b/sound/oss/dmasound/dmasound_core.c > @@ -1394,7 +1394,7 @@ static int state_init(void) > * This function is called by _one_ chipset-specific driver > */ > > -int dmasound_init(void) > +int __init dmasound_init(void) > { > int res ; > #ifdef MODULE > -- > 1.8.4.5 This patch has the same problem than [PATCH 1/1] SND/PCI/HDA: add __init to snd_hda_add_codec_preset (Thanks to Takashi Iwai for review) Regards, Fabian >
diff --git a/sound/oss/dmasound/dmasound.h b/sound/oss/dmasound/dmasound.h index 01019f0..a181ed2 100644 --- a/sound/oss/dmasound/dmasound.h +++ b/sound/oss/dmasound/dmasound.h @@ -86,7 +86,7 @@ static inline int ioctl_return(int __user *addr, int value) * Initialization */ -extern int dmasound_init(void); +extern int __init dmasound_init(void); #ifdef MODULE extern void dmasound_deinit(void); #else diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c index f4ee85a..1f0a42c 100644 --- a/sound/oss/dmasound/dmasound_core.c +++ b/sound/oss/dmasound/dmasound_core.c @@ -1394,7 +1394,7 @@ static int state_init(void) * This function is called by _one_ chipset-specific driver */ -int dmasound_init(void) +int __init dmasound_init(void) { int res ; #ifdef MODULE
dmasound_init is only called by __init functions: __init dmasound_q40_init __init amiga_audio_probe __init dmasound_atari_init Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.de> Signed-off-by: Fabian Frederick <fabf@skynet.be> --- sound/oss/dmasound/dmasound.h | 2 +- sound/oss/dmasound/dmasound_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)