Re: 2.6.17-rc6 sound drivers have section mismatch errors

[Takashi Iwai <tiwai@suse.de>]

At Fri, 09 Jun 2006 12:47:49 +0100,
Barry Scott wrote:
> 
> I'm trying to build 2.6.17 as suggested on the user list to get Intel 
> HDA working.
> But, as reported by me on Linux Dev list, there a lot of problems with 
> section mismatch
> in a number of drivers including the sound drivers. Here are the sound 
> related messages:
> 
> WARNING: sound/isa/sb/snd-sbawe.o - Section mismatch: reference to 
> .init.text:snd_emu8000_new from .text between 'snd_sb16_probe' (at 
> offset 0x440) and 'snd_sb16_nonpnp_remove'
> WARNING: sound/isa/snd-opl3sa2.o - Section mismatch: reference to 
> .init.text: from .text between 'snd_opl3sa2_pnp_cdetect' (at offset 
> 0xe61) and 'snd_opl3sa2_pnp_detect'
> WARNING: sound/isa/snd-opl3sa2.o - Section mismatch: reference to 
> .init.text: from .text between 'snd_opl3sa2_pnp_detect' (at offset 
> 0xf52) and 'snd_opl3sa2_put_single'
> 
> The Linux Dev folks are looking for someone to look at these problems.

The patch below should fix.


diff -r 4599255ac532 sound/isa/opl3sa2.c
--- a/sound/isa/opl3sa2.c	Thu Jun 08 12:01:44 2006 +0200
+++ b/sound/isa/opl3sa2.c	Fri Jun 09 14:28:01 2006 +0200
@@ -221,7 +221,7 @@ static void snd_opl3sa2_write(struct snd
 	spin_unlock_irqrestore(&chip->reg_lock, flags);
 }
 
-static int __init snd_opl3sa2_detect(struct snd_opl3sa2 *chip)
+static int __devinit snd_opl3sa2_detect(struct snd_opl3sa2 *chip)
 {
 	struct snd_card *card;
 	unsigned long port;
@@ -489,7 +489,7 @@ static void snd_opl3sa2_master_free(stru
 	chip->master_volume = NULL;
 }
 
-static int __init snd_opl3sa2_mixer(struct snd_opl3sa2 *chip)
+static int __devinit snd_opl3sa2_mixer(struct snd_opl3sa2 *chip)
 {
 	struct snd_card *card = chip->card;
 	struct snd_ctl_elem_id id1, id2;
@@ -583,8 +583,8 @@ static int snd_opl3sa2_resume(struct snd
 #endif /* CONFIG_PM */
 
 #ifdef CONFIG_PNP
-static int __init snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip,
-				  struct pnp_dev *pdev)
+static int __devinit snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip,
+				     struct pnp_dev *pdev)
 {
 	struct pnp_resource_table * cfg;
 	int err;
@@ -862,7 +862,7 @@ static struct pnp_card_driver opl3sa2_pn
 };
 #endif /* CONFIG_PNP */
 
-static int __init snd_opl3sa2_nonpnp_probe(struct platform_device *pdev)
+static int __devinit snd_opl3sa2_nonpnp_probe(struct platform_device *pdev)
 {
 	struct snd_card *card;
 	int err;
diff -r 4599255ac532 sound/isa/sb/emu8000.c
--- a/sound/isa/sb/emu8000.c	Thu Jun 08 12:01:44 2006 +0200
+++ b/sound/isa/sb/emu8000.c	Fri Jun 09 14:28:01 2006 +0200
@@ -1069,7 +1069,7 @@ static int snd_emu8000_dev_free(struct s
 /*
  * initialize and register emu8000 synth device.
  */
-int __init
+int __devinit
 snd_emu8000_new(struct snd_card *card, int index, long port, int seq_ports,
 		struct snd_seq_device **awe_ret)
 {