summaryrefslogtreecommitdiffstats
path: root/sound/pci/cmipci.c
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2011-12-15 13:49:36 +1030
committerTakashi Iwai <tiwai@suse.de>2011-12-19 10:34:41 +0100
commita67ff6a54095e27093ea501fb143fefe51a536c2 (patch)
tree48cb687a7569a8b6d4051bc9051f565b43803982 /sound/pci/cmipci.c
parent1bba160a0777046967707bbcdc9fb09d334ab2e5 (diff)
downloadblackbird-obmc-linux-a67ff6a54095e27093ea501fb143fefe51a536c2.tar.gz
blackbird-obmc-linux-a67ff6a54095e27093ea501fb143fefe51a536c2.zip
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: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/cmipci.c')
-rw-r--r--sound/pci/cmipci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 954c9934748a..19b06269adc2 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -54,10 +54,10 @@ MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8738},"
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 switches */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable switches */
static long mpu_port[SNDRV_CARDS];
static long fm_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};
-static int soft_ac3[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};
+static bool soft_ac3[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};
#ifdef SUPPORT_JOYSTICK
static int joystick_port[SNDRV_CARDS];
#endif
OpenPOWER on IntegriCloud