diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2011-12-14 22:19:36 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-12-19 04:34:41 -0500 |
commit | a67ff6a54095e27093ea501fb143fefe51a536c2 (patch) | |
tree | 48cb687a7569a8b6d4051bc9051f565b43803982 /sound/usb/card.c | |
parent | 1bba160a0777046967707bbcdc9fb09d334ab2e5 (diff) |
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/usb/card.c')
-rw-r--r-- | sound/usb/card.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 0f6dc0d457bf..4a7be7b98331 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c | |||
@@ -78,14 +78,14 @@ MODULE_SUPPORTED_DEVICE("{{Generic,USB Audio}}"); | |||
78 | 78 | ||
79 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ | 79 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ |
80 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ | 80 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ |
81 | static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */ | 81 | static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */ |
82 | /* Vendor/product IDs for this card */ | 82 | /* Vendor/product IDs for this card */ |
83 | static int vid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 }; | 83 | static int vid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 }; |
84 | static int pid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 }; | 84 | static int pid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 }; |
85 | static int nrpacks = 8; /* max. number of packets per urb */ | 85 | static int nrpacks = 8; /* max. number of packets per urb */ |
86 | static int async_unlink = 1; | 86 | static bool async_unlink = 1; |
87 | static int device_setup[SNDRV_CARDS]; /* device parameter for this card */ | 87 | static int device_setup[SNDRV_CARDS]; /* device parameter for this card */ |
88 | static int ignore_ctl_error; | 88 | static bool ignore_ctl_error; |
89 | 89 | ||
90 | module_param_array(index, int, NULL, 0444); | 90 | module_param_array(index, int, NULL, 0444); |
91 | MODULE_PARM_DESC(index, "Index value for the USB audio adapter."); | 91 | MODULE_PARM_DESC(index, "Index value for the USB audio adapter."); |