Skip to contentSkip to conversation

OSS/DMASOUND: add __init to dmasound_init

PATCH In review Fabian Frederick 1 participant 2 messages Jun 9, 2014 – Jun 11, 2014 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 OSS/DMASOUND: add __init to dmasound_init

dmasound_init is only called by __init functions:

__init dmasound_q40_init
__init amiga_audio_probe
__init dmasound_atari_init

Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
---
 sound/oss/dmasound/dmasound.h      | 2 +-
 sound/oss/dmasound/dmasound_core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
sound/oss/dmasound/dmasound.h +1 -1
index 01019f0..a181ed2 100644
@@ -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
sound/oss/dmasound/dmasound_core.c +1 -1
index f4ee85a..1f0a42c 100644
@@ -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
Signature · 1 line
1.8.4.5
#1 lore raw
Quoted 42 lines · On Mon, 9 Jun 2014 16:53:59 +0200 Fabian Frederick <[email protected]> wrote:

dmasound_init is only called by __init functions:

__init dmasound_q40_init
__init amiga_audio_probe
__init dmasound_atari_init

Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
---
 sound/oss/dmasound/dmasound.h      | 2 +-
 sound/oss/dmasound/dmasound_core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
sound/oss/dmasound/dmasound.h +1 -1
index 01019f0..a181ed2 100644
@@ -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
sound/oss/dmasound/dmasound_core.c +1 -1
index f4ee85a..1f0a42c 100644
@@ -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
Signature · 1 line
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

Quoted 1 line