Skip to content

Commit

Permalink
sound: core: Remove redundant variable and return the last statement
Browse files Browse the repository at this point in the history
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 <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
imtangmeng authored and tiwai committed Feb 28, 2022
1 parent d248b27 commit e52b78f
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions sound/sound_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit e52b78f

Please sign in to comment.