[alsa-cvslog] alsa-kernel: New ChangeSet 4261:f0a0b4edd60b

[Takashi I. <ti...@su...>]

changeset:   4261:f0a0b4edd60b7f103937053f50bfeb5c361af382
tag:         tip
user:        tiwai
date:        Fri May 19 12:04:22 2006 +0200
files:       pci/cs5535audio/cs5535audio.c
description:
Single variables for cs5535audio

As per Takashi's feedback, this is a cleanup to make cs5535audio be
single device per system. The diff is against 2.6.17-rc4 with
Takashi's patch adding the module_params for index, id and enable. 

Signed-off-by: Jaya Kumar <jay...@gm...>


diff -r f2af7f046c04bec64252f5a0ceec1c7aed01cfb4 -r f0a0b4edd60b7f103937053f50bfeb5c361af382 pci/cs5535audio/cs5535audio.c
--- a/pci/cs5535audio/cs5535audio.c	Thu May 18 14:48:26 2006 +0200
+++ b/pci/cs5535audio/cs5535audio.c	Fri May 19 12:04:22 2006 +0200
@@ -56,16 +56,17 @@ static struct ac97_quirk ac97_quirks[] _
 	{}
 };
 
-static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
-static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
-
-module_param_array(index, int, NULL, 0444);
+static int index = SNDRV_DEFAULT_IDX1;
+static char *id = SNDRV_DEFAULT_STR1;
+/* for backward compatibility */
+static int enable; 
+
+module_param(index, int, 0444);
 MODULE_PARM_DESC(index, "Index value for " DRIVER_NAME);
-module_param_array(id, charp, NULL, 0444);
+module_param(id, charp, 0444);
 MODULE_PARM_DESC(id, "ID string for " DRIVER_NAME);
-module_param_array(enable, bool, NULL, 0444);
-MODULE_PARM_DESC(enable, "Enable " DRIVER_NAME);
+module_param(enable, bool, 0444);
+MODULE_PARM_DESC(enable, "Enable for " DRIVER_NAME);
 
 static struct pci_device_id snd_cs5535audio_ids[] __devinitdata = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO) },
@@ -357,12 +358,8 @@ static int __devinit snd_cs5535audio_pro
 
 	if (dev >= SNDRV_CARDS)
 		return -ENODEV;
-	if (!enable[dev]) {
-		dev++;
-		return -ENOENT;
-	}
-
-	card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+
+	card = snd_card_new(index, id, THIS_MODULE, 0);
 	if (card == NULL)
 		return -ENOMEM;