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/oss/pss.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/oss/pss.c')
-rw-r--r-- | sound/oss/pss.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/oss/pss.c b/sound/oss/pss.c index 2fc0624024b5..0f32a561f15f 100644 --- a/sound/oss/pss.c +++ b/sound/oss/pss.c | |||
@@ -117,9 +117,9 @@ | |||
117 | 117 | ||
118 | /* If compiled into kernel, it enable or disable pss mixer */ | 118 | /* If compiled into kernel, it enable or disable pss mixer */ |
119 | #ifdef CONFIG_PSS_MIXER | 119 | #ifdef CONFIG_PSS_MIXER |
120 | static int pss_mixer = 1; | 120 | static bool pss_mixer = 1; |
121 | #else | 121 | #else |
122 | static int pss_mixer; | 122 | static bool pss_mixer; |
123 | #endif | 123 | #endif |
124 | 124 | ||
125 | 125 | ||
@@ -147,7 +147,7 @@ static DEFINE_SPINLOCK(lock); | |||
147 | static int pss_initialized; | 147 | static int pss_initialized; |
148 | static int nonstandard_microcode; | 148 | static int nonstandard_microcode; |
149 | static int pss_cdrom_port = -1; /* Parameter for the PSS cdrom port */ | 149 | static int pss_cdrom_port = -1; /* Parameter for the PSS cdrom port */ |
150 | static int pss_enable_joystick; /* Parameter for enabling the joystick */ | 150 | static bool pss_enable_joystick; /* Parameter for enabling the joystick */ |
151 | static coproc_operations pss_coproc_operations; | 151 | static coproc_operations pss_coproc_operations; |
152 | 152 | ||
153 | static void pss_write(pss_confdata *devc, int data) | 153 | static void pss_write(pss_confdata *devc, int data) |
@@ -1133,8 +1133,8 @@ static int mss_irq __initdata = -1; | |||
1133 | static int mss_dma __initdata = -1; | 1133 | static int mss_dma __initdata = -1; |
1134 | static int mpu_io __initdata = -1; | 1134 | static int mpu_io __initdata = -1; |
1135 | static int mpu_irq __initdata = -1; | 1135 | static int mpu_irq __initdata = -1; |
1136 | static int pss_no_sound = 0; /* Just configure non-sound components */ | 1136 | static bool pss_no_sound = 0; /* Just configure non-sound components */ |
1137 | static int pss_keep_settings = 1; /* Keep hardware settings at module exit */ | 1137 | static bool pss_keep_settings = 1; /* Keep hardware settings at module exit */ |
1138 | static char *pss_firmware = "/etc/sound/pss_synth"; | 1138 | static char *pss_firmware = "/etc/sound/pss_synth"; |
1139 | 1139 | ||
1140 | module_param(pss_io, int, 0); | 1140 | module_param(pss_io, int, 0); |