ALSA: es18xx: code improvements

1. Set the third argument of the snd_device_new to not NULL, so there is no warning about bug during chip detection. The third argument is not used in this driver. It was changed in my previous patch. 2. Remove the fm_port and mpu_port fields from the snd_es18xx structure. They can be converted to function arguments. 3. Remove the dmaN_size fields from the snd_es18xx structure. These values are used only in pointer functions and can be easily calculated. 4. Remove the ctrl_lock spinlock which is used only in one read function which is called once during chip initialization. There are many writes to the same register and they are not protected on purpose (see the comment ina the snd_es18xx_config_write()). 5. Use the first part of the text5Sources string table as the text4Soruces table (they are the same). 6. Merge the same cases for the ES1887 and ES1888 when setting chip's caps. 7. Move the snd_es18xx_reset() to __devinit section. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>

ALSA: es18xx: code improvements
1. Set the third argument of the snd_device_new to not NULL, so there is no warning about bug during chip detection. The third argument is not used in this driver. It was changed in my previous patch. 2. Remove the fm_port and mpu_port fields from the snd_es18xx structure. They can be converted to function arguments. 3. Remove the dmaN_size fields from the snd_es18xx structure. These values are used only in pointer functions and can be easily calculated. 4. Remove the ctrl_lock spinlock which is used only in one read function which is called once during chip initialization. There are many writes to the same register and they are not protected on purpose (see the comment ina the snd_es18xx_config_write()). 5. Use the first part of the text5Sources string table as the text4Soruces table (they are the same). 6. Merge the same cases for the ES1887 and ES1888 when setting chip's caps. 7. Move the snd_es18xx_reset() to __devinit section. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Krzysztof Helt · Takashi Iwai
1 parent d114cd84a1
Showing 1 changed file with 41 additions and 50 deletions Side-by-side Diff
sound/isa/es18xx.c
@@ -102,8 +102,6 @@
  
 struct snd_es18xx {
 	unsigned long port;		/* port of ESS chip */
-	unsigned long mpu_port;		/* MPU-401 port of ESS chip */
-	unsigned long fm_port;		/* FM port */
 	unsigned long ctrl_port;	/* Control port of ESS chip */
 	struct resource *res_port;
 	struct resource *res_mpu_port;
@@ -116,8 +114,6 @@
 	unsigned short audio2_vol;	/* volume level of audio2 */
  
 	unsigned short active;		/* active channel mask */
-	unsigned int dma1_size;
-	unsigned int dma2_size;
 	unsigned int dma1_shift;
 	unsigned int dma2_shift;
  
@@ -135,7 +131,6 @@
  
 	spinlock_t reg_lock;
 	spinlock_t mixer_lock;
-	spinlock_t ctrl_lock;
 #ifdef CONFIG_PM
 	unsigned char pm_reg;
 #endif
@@ -354,7 +349,7 @@
 }
  
  
-static int snd_es18xx_reset(struct snd_es18xx *chip)
+static int __devinit snd_es18xx_reset(struct snd_es18xx *chip)
 {
 	int i;
         outb(0x03, chip->port + 0x06);
@@ -490,8 +485,6 @@
 	unsigned int size = snd_pcm_lib_buffer_bytes(substream);
 	unsigned int count = snd_pcm_lib_period_bytes(substream);
  
-	chip->dma2_size = size;
-
         snd_es18xx_rate_set(chip, substream, DAC2);
  
         /* Transfer Count Reload */
@@ -591,8 +584,6 @@
 	unsigned int size = snd_pcm_lib_buffer_bytes(substream);
 	unsigned int count = snd_pcm_lib_period_bytes(substream);
  
-	chip->dma1_size = size;
-
 	snd_es18xx_reset_fifo(chip);
  
         /* Set stereo/mono */
@@ -659,8 +650,6 @@
 	unsigned int size = snd_pcm_lib_buffer_bytes(substream);
 	unsigned int count = snd_pcm_lib_period_bytes(substream);
  
-	chip->dma1_size = size;
-
 	snd_es18xx_reset_fifo(chip);
  
         /* Set stereo/mono */
  
  
@@ -821,17 +810,18 @@
 static snd_pcm_uframes_t snd_es18xx_playback_pointer(struct snd_pcm_substream *substream)
 {
         struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
+	unsigned int size = snd_pcm_lib_buffer_bytes(substream);
 	int pos;
  
 	if (substream->number == 0 && (chip->caps & ES18XX_PCM2)) {
 		if (!(chip->active & DAC2))
 			return 0;
-		pos = snd_dma_pointer(chip->dma2, chip->dma2_size);
+		pos = snd_dma_pointer(chip->dma2, size);
 		return pos >> chip->dma2_shift;
 	} else {
 		if (!(chip->active & DAC1))
 			return 0;
-		pos = snd_dma_pointer(chip->dma1, chip->dma1_size);
+		pos = snd_dma_pointer(chip->dma1, size);
 		return pos >> chip->dma1_shift;
 	}
 }
  
@@ -839,11 +829,12 @@
 static snd_pcm_uframes_t snd_es18xx_capture_pointer(struct snd_pcm_substream *substream)
 {
         struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
+	unsigned int size = snd_pcm_lib_buffer_bytes(substream);
 	int pos;
  
         if (!(chip->active & ADC1))
                 return 0;
-	pos = snd_dma_pointer(chip->dma1, chip->dma1_size);
+	pos = snd_dma_pointer(chip->dma1, size);
 	return pos >> chip->dma1_shift;
 }
  
@@ -974,9 +965,6 @@
  
 static int snd_es18xx_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-	static char *texts4Source[4] = {
-		"Mic", "CD", "Line", "Master"
-	};
 	static char *texts5Source[5] = {
 		"Mic", "CD", "Line", "Master", "Mix"
 	};
@@ -994,7 +982,8 @@
 		uinfo->value.enumerated.items = 4;
 		if (uinfo->value.enumerated.item > 3)
 			uinfo->value.enumerated.item = 3;
-		strcpy(uinfo->value.enumerated.name, texts4Source[uinfo->value.enumerated.item]);
+		strcpy(uinfo->value.enumerated.name,
+			texts5Source[uinfo->value.enumerated.item]);
 		break;
 	case 0x1887:
 	case 0x1888:
  
@@ -1378,11 +1367,9 @@
 static int __devinit snd_es18xx_config_read(struct snd_es18xx *chip, unsigned char reg)
 {
 	int data;
-	unsigned long flags;
-        spin_lock_irqsave(&chip->ctrl_lock, flags);
+
 	outb(reg, chip->ctrl_port);
 	data = inb(chip->ctrl_port + 1);
-        spin_unlock_irqrestore(&chip->ctrl_lock, flags);
 	return data;
 }
  
@@ -1398,7 +1385,9 @@
 #endif
 }
  
-static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip)
+static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip,
+					   unsigned long mpu_port,
+					   unsigned long fm_port)
 {
 	int mask = 0;
  
  
  
  
@@ -1412,15 +1401,15 @@
 	if (chip->caps & ES18XX_CONTROL) {
 		/* Hardware volume IRQ */
 		snd_es18xx_config_write(chip, 0x27, chip->irq);
-		if (chip->fm_port > 0 && chip->fm_port != SNDRV_AUTO_PORT) {
+		if (fm_port > 0 && fm_port != SNDRV_AUTO_PORT) {
 			/* FM I/O */
-			snd_es18xx_config_write(chip, 0x62, chip->fm_port >> 8);
-			snd_es18xx_config_write(chip, 0x63, chip->fm_port & 0xff);
+			snd_es18xx_config_write(chip, 0x62, fm_port >> 8);
+			snd_es18xx_config_write(chip, 0x63, fm_port & 0xff);
 		}
-		if (chip->mpu_port > 0 && chip->mpu_port != SNDRV_AUTO_PORT) {
+		if (mpu_port > 0 && mpu_port != SNDRV_AUTO_PORT) {
 			/* MPU-401 I/O */
-			snd_es18xx_config_write(chip, 0x64, chip->mpu_port >> 8);
-			snd_es18xx_config_write(chip, 0x65, chip->mpu_port & 0xff);
+			snd_es18xx_config_write(chip, 0x64, mpu_port >> 8);
+			snd_es18xx_config_write(chip, 0x65, mpu_port & 0xff);
 			/* MPU-401 IRQ */
 			snd_es18xx_config_write(chip, 0x28, chip->irq);
 		}
  
@@ -1507,11 +1496,12 @@
 		snd_es18xx_mixer_write(chip, 0x7A, 0x68);
 		/* Enable and set hardware volume interrupt */
 		snd_es18xx_mixer_write(chip, 0x64, 0x06);
-		if (chip->mpu_port > 0 && chip->mpu_port != SNDRV_AUTO_PORT) {
+		if (mpu_port > 0 && mpu_port != SNDRV_AUTO_PORT) {
 			/* MPU401 share irq with audio
 			   Joystick enabled
 			   FM enabled */
-			snd_es18xx_mixer_write(chip, 0x40, 0x43 | (chip->mpu_port & 0xf0) >> 1);
+			snd_es18xx_mixer_write(chip, 0x40,
+					       0x43 | (mpu_port & 0xf0) >> 1);
 		}
 		snd_es18xx_mixer_write(chip, 0x7f, ((irqmask + 1) << 1) | 0x01);
 	}
@@ -1629,7 +1619,9 @@
 	return 0;
 }
  
-static int __devinit snd_es18xx_probe(struct snd_es18xx *chip)
+static int __devinit snd_es18xx_probe(struct snd_es18xx *chip,
+					unsigned long mpu_port,
+					unsigned long fm_port)
 {
 	if (snd_es18xx_identify(chip) < 0) {
 		snd_printk(KERN_ERR PFX "[0x%lx] ESS chip not found\n", chip->port);
@@ -1650,8 +1642,6 @@
 		chip->caps = ES18XX_PCM2 | ES18XX_SPATIALIZER | ES18XX_RECMIX | ES18XX_NEW_RATE | ES18XX_AUXB | ES18XX_I2S | ES18XX_CONTROL | ES18XX_HWV;
 		break;
 	case 0x1887:
-		chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME;
-		break;
 	case 0x1888:
 		chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME;
 		break;
@@ -1666,7 +1656,7 @@
 	if (chip->dma1 == chip->dma2)
 		chip->caps &= ~(ES18XX_PCM2 | ES18XX_DUPLEX_SAME);
  
-        return snd_es18xx_initialize(chip);
+	return snd_es18xx_initialize(chip, mpu_port, fm_port);
 }
  
 static struct snd_pcm_ops snd_es18xx_playback_ops = {
  
@@ -1802,10 +1792,7 @@
  
 	spin_lock_init(&chip->reg_lock);
  	spin_lock_init(&chip->mixer_lock);
- 	spin_lock_init(&chip->ctrl_lock);
         chip->port = port;
-        chip->mpu_port = mpu_port;
-        chip->fm_port = fm_port;
         chip->irq = -1;
         chip->dma1 = -1;
         chip->dma2 = -1;
  
@@ -1841,11 +1828,11 @@
 	}
 	chip->dma2 = dma2;
  
-        if (snd_es18xx_probe(chip) < 0) {
+	if (snd_es18xx_probe(chip, mpu_port, fm_port) < 0) {
 		snd_es18xx_free(card);
-                return -ENODEV;
-        }
-	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, NULL, &ops);
+		return -ENODEV;
+	}
+	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
 	if (err < 0) {
 		snd_es18xx_free(card);
 		return err;
@@ -1980,7 +1967,7 @@
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */
 #ifdef CONFIG_PNP
-static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static int isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;
 #endif
 static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* 0x220,0x240,0x260,0x280 */
 #ifndef CONFIG_PNP
  
  
@@ -2160,19 +2147,23 @@
 		return err;
  
 	if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
-		if (snd_opl3_create(card, chip->fm_port, chip->fm_port + 2, OPL3_HW_OPL3, 0, &opl3) < 0) {
-			snd_printk(KERN_WARNING PFX "opl3 not detected at 0x%lx\n", chip->fm_port);
+		if (snd_opl3_create(card, fm_port[dev], fm_port[dev] + 2,
+				    OPL3_HW_OPL3, 0, &opl3) < 0) {
+			snd_printk(KERN_WARNING PFX
+				   "opl3 not detected at 0x%lx\n",
+				   fm_port[dev]);
 		} else {
-			if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0)
+			err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
+			if (err < 0)
 				return err;
 		}
 	}
  
 	if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
-		if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES18XX,
-					       chip->mpu_port, 0,
-					       irq[dev], 0,
-					       &chip->rmidi)) < 0)
+		err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES18XX,
+					  mpu_port[dev], 0,
+					  irq[dev], 0, &chip->rmidi);
+		if (err < 0)
 			return err;
 	}
...	...	@@ -102,8 +102,6 @@
102	102
103	103	struct snd_es18xx {
104	104	unsigned long port; /* port of ESS chip */
105		- unsigned long mpu_port; /* MPU-401 port of ESS chip */
106		- unsigned long fm_port; /* FM port */
107	105	unsigned long ctrl_port; /* Control port of ESS chip */
108	106	struct resource *res_port;
109	107	struct resource *res_mpu_port;
...	...	@@ -116,8 +114,6 @@
116	114	unsigned short audio2_vol; /* volume level of audio2 */
117	115
118	116	unsigned short active; /* active channel mask */
119		- unsigned int dma1_size;
120		- unsigned int dma2_size;
121	117	unsigned int dma1_shift;
122	118	unsigned int dma2_shift;
123	119
...	...	@@ -135,7 +131,6 @@
135	131
136	132	spinlock_t reg_lock;
137	133	spinlock_t mixer_lock;
138		- spinlock_t ctrl_lock;
139	134	#ifdef CONFIG_PM
140	135	unsigned char pm_reg;
141	136	#endif
...	...	@@ -354,7 +349,7 @@
354	349	}
355	350
356	351
357		-static int snd_es18xx_reset(struct snd_es18xx *chip)
	352	+static int __devinit snd_es18xx_reset(struct snd_es18xx *chip)
358	353	{
359	354	int i;
360	355	outb(0x03, chip->port + 0x06);
...	...	@@ -490,8 +485,6 @@
490	485	unsigned int size = snd_pcm_lib_buffer_bytes(substream);
491	486	unsigned int count = snd_pcm_lib_period_bytes(substream);
492	487
493		- chip->dma2_size = size;
494		-
495	488	snd_es18xx_rate_set(chip, substream, DAC2);
496	489
497	490	/* Transfer Count Reload */
...	...	@@ -591,8 +584,6 @@
591	584	unsigned int size = snd_pcm_lib_buffer_bytes(substream);
592	585	unsigned int count = snd_pcm_lib_period_bytes(substream);
593	586
594		- chip->dma1_size = size;
595		-
596	587	snd_es18xx_reset_fifo(chip);
597	588
598	589	/* Set stereo/mono */
...	...	@@ -659,8 +650,6 @@
659	650	unsigned int size = snd_pcm_lib_buffer_bytes(substream);
660	651	unsigned int count = snd_pcm_lib_period_bytes(substream);
661	652
662		- chip->dma1_size = size;
663		-
664	653	snd_es18xx_reset_fifo(chip);
665	654
666	655	/* Set stereo/mono */
667	656
668	657
...	...	@@ -821,17 +810,18 @@
821	810	static snd_pcm_uframes_t snd_es18xx_playback_pointer(struct snd_pcm_substream *substream)
822	811	{
823	812	struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
	813	+ unsigned int size = snd_pcm_lib_buffer_bytes(substream);
824	814	int pos;
825	815
826	816	if (substream->number == 0 && (chip->caps & ES18XX_PCM2)) {
827	817	if (!(chip->active & DAC2))
828	818	return 0;
829		- pos = snd_dma_pointer(chip->dma2, chip->dma2_size);
	819	+ pos = snd_dma_pointer(chip->dma2, size);
830	820	return pos >> chip->dma2_shift;
831	821	} else {
832	822	if (!(chip->active & DAC1))
833	823	return 0;
834		- pos = snd_dma_pointer(chip->dma1, chip->dma1_size);
	824	+ pos = snd_dma_pointer(chip->dma1, size);
835	825	return pos >> chip->dma1_shift;
836	826	}
837	827	}
838	828
...	...	@@ -839,11 +829,12 @@
839	829	static snd_pcm_uframes_t snd_es18xx_capture_pointer(struct snd_pcm_substream *substream)
840	830	{
841	831	struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
	832	+ unsigned int size = snd_pcm_lib_buffer_bytes(substream);
842	833	int pos;
843	834
844	835	if (!(chip->active & ADC1))
845	836	return 0;
846		- pos = snd_dma_pointer(chip->dma1, chip->dma1_size);
	837	+ pos = snd_dma_pointer(chip->dma1, size);
847	838	return pos >> chip->dma1_shift;
848	839	}
849	840
...	...	@@ -974,9 +965,6 @@
974	965
975	966	static int snd_es18xx_info_mux(struct snd_kcontrol kcontrol, struct snd_ctl_elem_info uinfo)
976	967	{
977		- static char *texts4Source[4] = {
978		- "Mic", "CD", "Line", "Master"
979		- };
980	968	static char *texts5Source[5] = {
981	969	"Mic", "CD", "Line", "Master", "Mix"
982	970	};
...	...	@@ -994,7 +982,8 @@
994	982	uinfo->value.enumerated.items = 4;
995	983	if (uinfo->value.enumerated.item > 3)
996	984	uinfo->value.enumerated.item = 3;
997		- strcpy(uinfo->value.enumerated.name, texts4Source[uinfo->value.enumerated.item]);
	985	+ strcpy(uinfo->value.enumerated.name,
	986	+ texts5Source[uinfo->value.enumerated.item]);
998	987	break;
999	988	case 0x1887:
1000	989	case 0x1888:
1001	990
...	...	@@ -1378,11 +1367,9 @@
1378	1367	static int __devinit snd_es18xx_config_read(struct snd_es18xx *chip, unsigned char reg)
1379	1368	{
1380	1369	int data;
1381		- unsigned long flags;
1382		- spin_lock_irqsave(&chip->ctrl_lock, flags);
	1370	+
1383	1371	outb(reg, chip->ctrl_port);
1384	1372	data = inb(chip->ctrl_port + 1);
1385		- spin_unlock_irqrestore(&chip->ctrl_lock, flags);
1386	1373	return data;
1387	1374	}
1388	1375
...	...	@@ -1398,7 +1385,9 @@
1398	1385	#endif
1399	1386	}
1400	1387
1401		-static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip)
	1388	+static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip,
	1389	+ unsigned long mpu_port,
	1390	+ unsigned long fm_port)
1402	1391	{
1403	1392	int mask = 0;
1404	1393
1405	1394
1406	1395
1407	1396
...	...	@@ -1412,15 +1401,15 @@
1412	1401	if (chip->caps & ES18XX_CONTROL) {
1413	1402	/* Hardware volume IRQ */
1414	1403	snd_es18xx_config_write(chip, 0x27, chip->irq);
1415		- if (chip->fm_port > 0 && chip->fm_port != SNDRV_AUTO_PORT) {
	1404	+ if (fm_port > 0 && fm_port != SNDRV_AUTO_PORT) {
1416	1405	/* FM I/O */
1417		- snd_es18xx_config_write(chip, 0x62, chip->fm_port >> 8);
1418		- snd_es18xx_config_write(chip, 0x63, chip->fm_port & 0xff);
	1406	+ snd_es18xx_config_write(chip, 0x62, fm_port >> 8);
	1407	+ snd_es18xx_config_write(chip, 0x63, fm_port & 0xff);
1419	1408	}
1420		- if (chip->mpu_port > 0 && chip->mpu_port != SNDRV_AUTO_PORT) {
	1409	+ if (mpu_port > 0 && mpu_port != SNDRV_AUTO_PORT) {
1421	1410	/* MPU-401 I/O */
1422		- snd_es18xx_config_write(chip, 0x64, chip->mpu_port >> 8);
1423		- snd_es18xx_config_write(chip, 0x65, chip->mpu_port & 0xff);
	1411	+ snd_es18xx_config_write(chip, 0x64, mpu_port >> 8);
	1412	+ snd_es18xx_config_write(chip, 0x65, mpu_port & 0xff);
1424	1413	/* MPU-401 IRQ */
1425	1414	snd_es18xx_config_write(chip, 0x28, chip->irq);
1426	1415	}
1427	1416
...	...	@@ -1507,11 +1496,12 @@
1507	1496	snd_es18xx_mixer_write(chip, 0x7A, 0x68);
1508	1497	/* Enable and set hardware volume interrupt */
1509	1498	snd_es18xx_mixer_write(chip, 0x64, 0x06);
1510		- if (chip->mpu_port > 0 && chip->mpu_port != SNDRV_AUTO_PORT) {
	1499	+ if (mpu_port > 0 && mpu_port != SNDRV_AUTO_PORT) {
1511	1500	/* MPU401 share irq with audio
1512	1501	Joystick enabled
1513	1502	FM enabled */
1514		- snd_es18xx_mixer_write(chip, 0x40, 0x43 \| (chip->mpu_port & 0xf0) >> 1);
	1503	+ snd_es18xx_mixer_write(chip, 0x40,
	1504	+ 0x43 \| (mpu_port & 0xf0) >> 1);
1515	1505	}
1516	1506	snd_es18xx_mixer_write(chip, 0x7f, ((irqmask + 1) << 1) \| 0x01);
1517	1507	}
...	...	@@ -1629,7 +1619,9 @@
1629	1619	return 0;
1630	1620	}
1631	1621
1632		-static int __devinit snd_es18xx_probe(struct snd_es18xx *chip)
	1622	+static int __devinit snd_es18xx_probe(struct snd_es18xx *chip,
	1623	+ unsigned long mpu_port,
	1624	+ unsigned long fm_port)
1633	1625	{
1634	1626	if (snd_es18xx_identify(chip) < 0) {
1635	1627	snd_printk(KERN_ERR PFX "[0x%lx] ESS chip not found\n", chip->port);
...	...	@@ -1650,8 +1642,6 @@
1650	1642	chip->caps = ES18XX_PCM2 \| ES18XX_SPATIALIZER \| ES18XX_RECMIX \| ES18XX_NEW_RATE \| ES18XX_AUXB \| ES18XX_I2S \| ES18XX_CONTROL \| ES18XX_HWV;
1651	1643	break;
1652	1644	case 0x1887:
1653		- chip->caps = ES18XX_PCM2 \| ES18XX_RECMIX \| ES18XX_AUXB \| ES18XX_DUPLEX_SAME;
1654		- break;
1655	1645	case 0x1888:
1656	1646	chip->caps = ES18XX_PCM2 \| ES18XX_RECMIX \| ES18XX_AUXB \| ES18XX_DUPLEX_SAME;
1657	1647	break;
...	...	@@ -1666,7 +1656,7 @@
1666	1656	if (chip->dma1 == chip->dma2)
1667	1657	chip->caps &= ~(ES18XX_PCM2 \| ES18XX_DUPLEX_SAME);
1668	1658
1669		- return snd_es18xx_initialize(chip);
	1659	+ return snd_es18xx_initialize(chip, mpu_port, fm_port);
1670	1660	}
1671	1661
1672	1662	static struct snd_pcm_ops snd_es18xx_playback_ops = {
1673	1663
...	...	@@ -1802,10 +1792,7 @@
1802	1792
1803	1793	spin_lock_init(&chip->reg_lock);
1804	1794	spin_lock_init(&chip->mixer_lock);
1805		- spin_lock_init(&chip->ctrl_lock);
1806	1795	chip->port = port;
1807		- chip->mpu_port = mpu_port;
1808		- chip->fm_port = fm_port;
1809	1796	chip->irq = -1;
1810	1797	chip->dma1 = -1;
1811	1798	chip->dma2 = -1;
1812	1799
...	...	@@ -1841,11 +1828,11 @@
1841	1828	}
1842	1829	chip->dma2 = dma2;
1843	1830
1844		- if (snd_es18xx_probe(chip) < 0) {
	1831	+ if (snd_es18xx_probe(chip, mpu_port, fm_port) < 0) {
1845	1832	snd_es18xx_free(card);
1846		- return -ENODEV;
1847		- }
1848		- err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, NULL, &ops);
	1833	+ return -ENODEV;
	1834	+ }
	1835	+ err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
1849	1836	if (err < 0) {
1850	1837	snd_es18xx_free(card);
1851	1838	return err;
...	...	@@ -1980,7 +1967,7 @@
1980	1967	static char id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; / ID for this card */
1981	1968	static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */
1982	1969	#ifdef CONFIG_PNP
1983		-static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
	1970	+static int isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;
1984	1971	#endif
1985	1972	static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x220,0x240,0x260,0x280 */
1986	1973	#ifndef CONFIG_PNP
1987	1974
1988	1975
...	...	@@ -2160,19 +2147,23 @@
2160	2147	return err;
2161	2148
2162	2149	if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
2163		- if (snd_opl3_create(card, chip->fm_port, chip->fm_port + 2, OPL3_HW_OPL3, 0, &opl3) < 0) {
2164		- snd_printk(KERN_WARNING PFX "opl3 not detected at 0x%lx\n", chip->fm_port);
	2150	+ if (snd_opl3_create(card, fm_port[dev], fm_port[dev] + 2,
	2151	+ OPL3_HW_OPL3, 0, &opl3) < 0) {
	2152	+ snd_printk(KERN_WARNING PFX
	2153	+ "opl3 not detected at 0x%lx\n",
	2154	+ fm_port[dev]);
2165	2155	} else {
2166		- if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0)
	2156	+ err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
	2157	+ if (err < 0)
2167	2158	return err;
2168	2159	}
2169	2160	}
2170	2161
2171	2162	if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
2172		- if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES18XX,
2173		- chip->mpu_port, 0,
2174		- irq[dev], 0,
2175		- &chip->rmidi)) < 0)
	2163	+ err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES18XX,
	2164	+ mpu_port[dev], 0,
	2165	+ irq[dev], 0, &chip->rmidi);
	2166	+ if (err < 0)
2176	2167	return err;
2177	2168	}
2178	2169