aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeng Tang <tangmeng@uniontech.com>2022-02-28 13:02:52 +0800
committerTakashi Iwai <tiwai@suse.de>2022-02-28 17:56:59 +0100
commitd248b2771f543417dea7f9af8be05190594e0621 (patch)
tree8679705b068a98a3e5fa560da907ce7a181b1f45
parentALSA: spi: Add check for clk_enable() (diff)
downloadlinux-dev-d248b2771f543417dea7f9af8be05190594e0621.tar.xz
linux-dev-d248b2771f543417dea7f9af8be05190594e0621.zip
sound: core: remove initialise static variables to 0
Initializing the static variable to 0 causes the following error when exec checkpatch: ERROR: do not initialise statics to 0 FILE: sound/sound_core.c:142: static int preclaim_oss = 0; In addition, considering the following way of writing 139: #ifdef config_sound_oss_core_preclaim 140: Static int preclaim_oss = 1; 141: #ELSE 142: Static int preclaim_oss = 0; 143: #ENDIF We can optimize it by IS_ENABLED(CONFIG_SOUND_OSS_CORE_PRECLAIM), so modified it to static int preclaim_oss = IS_ENABLED(CONFIG_SOUND_OSS_CORE_PRECLAIM); Signed-off-by: Meng Tang <tangmeng@uniontech.com> Link: https://lore.kernel.org/r/20220228050253.1649-1-tangmeng@uniontech.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/sound_core.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/sound_core.c b/sound/sound_core.c
index 90d118cd9164..aa4a57e488e5 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -136,11 +136,7 @@ struct sound_unit
* All these clutters are scheduled to be removed along with
* sound-slot/service-* module aliases.
*/
-#ifdef CONFIG_SOUND_OSS_CORE_PRECLAIM
-static int preclaim_oss = 1;
-#else
-static int preclaim_oss = 0;
-#endif
+static int preclaim_oss = IS_ENABLED(CONFIG_SOUND_OSS_CORE_PRECLAIM);
module_param(preclaim_oss, int, 0444);