Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a67ff6a5 authored by Rusty Russell's avatar Rusty Russell Committed by Takashi Iwai
Browse files

ALSA: module_param: make bool parameters really bool 



module_param(bool) used to counter-intuitively take an int.  In
fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy
trick.

It's time to remove the int/unsigned int option.  For this version
it'll simply give a warning, but it'll break next kernel version.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1bba160a

Documentation/DocBook/writing-an-alsa-driver.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ 
  /* SNDRV_CARDS: maximum number of cards supported by this module */

  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;

  static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;



  /* definition of the chip-specific record */

  struct mychip {

sound/core/oss/pcm_oss.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 


static int dsp_map[SNDRV_CARDS];

static int adsp_map[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 1};

static int nonblock_open = 1;

static bool nonblock_open = 1;



MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, Abramo Bagnara <abramo@alsa-project.org>");

MODULE_DESCRIPTION("PCM OSS emulation for ALSA.");

sound/core/seq/seq_dummy.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ MODULE_LICENSE("GPL"); 
MODULE_ALIAS("snd-seq-client-" __stringify(SNDRV_SEQ_CLIENT_DUMMY));



static int ports = 1;

static int duplex;

static bool duplex;



module_param(ports, int, 0444);

MODULE_PARM_DESC(ports, "number of ports to be created");

sound/drivers/aloop.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ MODULE_SUPPORTED_DEVICE("{{ALSA,Loopback soundcard}}"); 


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] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};

static bool enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};

static int pcm_substreams[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 8};

static int pcm_notify[SNDRV_CARDS];

sound/drivers/dummy.c

+3 −3
Original line number Diff line number Diff line
@@ -60,15 +60,15 @@ MODULE_SUPPORTED_DEVICE("{{ALSA,Dummy soundcard}}"); 


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] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};

static bool enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};

static char *model[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = NULL};

static int pcm_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};

static int pcm_substreams[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 8};

//static int midi_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};

#ifdef CONFIG_HIGH_RES_TIMERS

static int hrtimer = 1;

static bool hrtimer = 1;

#endif

static int fake_buffer = 1;

static bool fake_buffer = 1;



module_param_array(index, int, NULL, 0444);

MODULE_PARM_DESC(index, "Index value for dummy soundcard.");