forked from Minki/linux
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>
This commit is contained in:
parent
d248b2771f
commit
e52b78f890
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user