summaryrefslogtreecommitdiff
path: root/sound/sound_core.c
diff options
context:
space:
mode:
authorMeng Tang <tangmeng@uniontech.com>2022-02-28 13:02:53 +0800
committerTakashi Iwai <tiwai@suse.de>2022-02-28 17:57:14 +0100
commite52b78f890675132989aaa298e1e1077b6bf9325 (patch)
tree6790bf4d18776c12c6f095ff492d7f2ca1ffd5ab /sound/sound_core.c
parentd248b2771f543417dea7f9af8be05190594e0621 (diff)
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>
Diffstat (limited to 'sound/sound_core.c')
-rw-r--r--sound/sound_core.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/sound/sound_core.c b/sound/sound_core.c
index aa4a57e488e5..3332fe321737 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);