From: Meng Tang <tangmeng@uniontech.com>
Date: Mon, 28 Feb 2022 05:02:53 +0000 (+0800)
Subject: sound: core: Remove redundant variable and return the last statement
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e52b78f890675132989aaa298e1e1077b6bf9325;p=linux.git

sound: core: Remove redundant variable and return the last statement

Return the result from file->f_op->open() directly instead of
taking this in another redundant variable. Make the typical
return the last statement, return early and reduce the indentation
too.

Signed-off-by: Meng Tang <tangmeng@uniontech.com>
Link: https://lore.kernel.org/r/20220228050253.1649-2-tangmeng@uniontech.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/sound_core.c b/sound/sound_core.c
index aa4a57e488e50..3332fe321737e 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -577,20 +577,20 @@ static int soundcore_open(struct inode *inode, struct file *file)
 			new_fops = fops_get(s->unit_fops);
 	}
 	spin_unlock(&sound_loader_lock);
-	if (new_fops) {
-		/*
-		 * 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);
+	if (!new_fops)
+		return -ENODEV;
 
-		return err;
-	}
-	return -ENODEV;
+	/*
+	 * We rely upon the fact that we can't be unloaded while the
+	 * subdriver is there.
+	 */
+	replace_fops(file, new_fops);
+
+	if (!file->f_op->open)
+		return -ENODEV;
+
+	return file->f_op->open(inode, file);
 }
 
 MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR);