Update of /cvsroot/alsa/alsa-kernel/sparc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20010/sparc
Modified Files: amd7930.c cs4231.c Log Message: use the new module_param*() functions. Index: amd7930.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/sparc/amd7930.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- amd7930.c 6 Mar 2004 17:24:24 -0000 1.8 +++ amd7930.c 7 Apr 2004 17:48:22 -0000 1.9 @@ -34,13 +34,13 @@ #include <linux/slab.h> #include <linux/init.h> #include <linux/interrupt.h> +#include <linux/moduleparam.h> #include <sound/driver.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/info.h> #include <sound/control.h> -#define SNDRV_GET_ID #include <sound/initval.h> #include <asm/io.h> @@ -50,14 +50,15 @@ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */ +static int boot_devs; -MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i"); +module_param_array(index, int, boot_devs, 0444); MODULE_PARM_DESC(index, "Index value for Sun AMD7930 soundcard."); MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC); -MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s"); +module_param_array(id, charp, boot_devs, 0444); MODULE_PARM_DESC(id, "ID string for Sun AMD7930 soundcard."); MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC); -MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i"); +module_param_array(enable, bool, boot_devs, 0444); MODULE_PARM_DESC(enable, "Enable Sun AMD7930 soundcard."); MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC); MODULE_AUTHOR("Thomas K. Dyas and David S. Miller"); @@ -1152,24 +1153,3 @@ module_init(amd7930_init); module_exit(amd7930_exit); - -#ifndef MODULE - -/* format is: snd-sun-amd7930=index,id,enable */ - -static int __init alsa_card_sun_amd7930_setup(char *str) -{ - static unsigned __initdata nr_dev = 0; - - if (nr_dev >= SNDRV_CARDS) - return 0; - (void)(get_option(&str,&index[nr_dev]) == 2 && - get_option(&str,&id[nr_dev]) == 2 && - get_id(&str,&enable[nr_dev]) == 2); - nr_dev++; - return 1; -} - -__setup("snd-sun-amd7930=", alsa_card_sun_amd7930_setup); - -#endif /* ifndef MODULE */ Index: cs4231.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/sparc/cs4231.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cs4231.c 16 Mar 2004 13:58:50 -0000 1.12 +++ cs4231.c 7 Apr 2004 17:48:22 -0000 1.13 @@ -15,6 +15,7 @@ #include <linux/delay.h> #include <linux/init.h> #include <linux/interrupt.h> +#include <linux/moduleparam.h> #include <sound/driver.h> #include <sound/core.h> @@ -22,7 +23,6 @@ #include <sound/info.h> #include <sound/control.h> #include <sound/timer.h> -#define SNDRV_GET_ID #include <sound/initval.h> #include <sound/pcm_params.h> @@ -49,14 +49,15 @@ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */ +static int boot_devs; -MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i"); +module_param_array(index, int, boot_devs, 0444); MODULE_PARM_DESC(index, "Index value for Sun CS4231 soundcard."); MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC); -MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s"); +module_param_array(id, charp, boot_devs, 0444); MODULE_PARM_DESC(id, "ID string for Sun CS4231 soundcard."); MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC); -MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i"); +module_param_array(enable, bool, boot_devs, 0444); MODULE_PARM_DESC(enable, "Enable Sun CS4231 soundcard."); MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC); MODULE_AUTHOR("Jaroslav Kysela, Derrick J. Brashear and David S. Miller"); @@ -2251,24 +2252,3 @@ module_init(cs4231_init); module_exit(cs4231_exit); - -#ifndef MODULE - -/* format is: snd-sun-cs4231=index,id,enable */ - -static int __init alsa_card_sun_cs4231_setup(char *str) -{ - static unsigned __initdata nr_dev = 0; - - if (nr_dev >= SNDRV_CARDS) - return 0; - (void)(get_option(&str,&index[nr_dev]) == 2 && - get_option(&str,&id[nr_dev]) == 2 && - get_id(&str,&enable[nr_dev]) == 2); - nr_dev++; - return 1; -} - -__setup("snd-sun-cs4231=", alsa_card_sun_cs4231_setup); - -#endif /* ifndef MODULE */ ------------------------------------------------------- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog