[PATCH 1/2] ALSA: core: remove initialise static variables to 0

[PATCH 1/2] ALSA: core: remove initialise static variables to 0

[Meng Tang]

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;

Static variable does not need to be initialised to 0, because
compiler will initialise all uninitialised statics to 0. Thus,
remove the unneeded initializations.

Signed-off-by: Meng Tang <tangmeng@uniontech.com>
---
 sound/sound_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/sound_core.c b/sound/sound_core.c
index 90d118cd9164..2ee54070b2b5 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -139,7 +139,7 @@ struct sound_unit
 #ifdef CONFIG_SOUND_OSS_CORE_PRECLAIM
 static int preclaim_oss = 1;
 #else
-static int preclaim_oss = 0;
+static int preclaim_oss;
 #endif
 
 module_param(preclaim_oss, int, 0444);
-- 
2.20.1

[PATCH 2/2] ALSA: core: Remove redundant 'err' variable

[Meng Tang]

Return the result from file->f_op->open() directly instead of
taking this in another redundant variable.

Signed-off-by: Meng Tang <tangmeng@uniontech.com>
---
 sound/sound_core.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sound/sound_core.c b/sound/sound_core.c
index 2ee54070b2b5..e7fa820b08be 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -586,13 +586,12 @@ static int soundcore_open(struct inode *inode, struct file *file)
 		 * We rely upon the fact that we can't be unloaded while the
 		 * subdriver is there.
 		 */
-		int err = 0;
 		replace_fops(file, new_fops);
 
 		if (file->f_op->open)
-			err = file->f_op->open(inode,file);
+			return file->f_op->open(inode, file);
 
-		return err;
+		return 0;
 	}
 	return -ENODEV;
 }
-- 
2.20.1

Re: [PATCH 1/2] ALSA: core: remove initialise static variables to 0

[Joe Perches]

On Sun, 2022-02-27 at 15:12 +0800, Meng Tang wrote:
> 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;
> 
> Static variable does not need to be initialised to 0, because
> compiler will initialise all uninitialised statics to 0. Thus,
> remove the unneeded initializations.
[]
> diff --git a/sound/sound_core.c b/sound/sound_core.c
[]
> @@ -139,7 +139,7 @@ struct sound_unit
>  #ifdef CONFIG_SOUND_OSS_CORE_PRECLAIM
>  static int preclaim_oss = 1;
>  #else
> -static int preclaim_oss = 0;
> +static int preclaim_oss;
>  #endif

Probably better without the #ifdef / #else / #endif as

static int preclaim_oss = IS_ENABLED(CONFIG_SOUND_OSS_CORE_PRECLAIM);