On Mon, 2022-02-28 at 13:02 +0800, Meng Tang wrote:
> 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@xxxxxxxxxxxxx>
> Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Hi Meng Tang.
For the next time: it's not necessary (or even good) to add a sign-off
for another person unless they specifically authorize one.
You wrote and are submitting these changes, I merely gave you simple
suggestions as to how you could improve them.
cheers, Joe
> ---
> sound/sound_core.c | 24 ++++++++++++------------
> 1 file 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);
