]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ALSA: pcm: Use CLASS() for fdget()/fdput()
authorTakashi Iwai <tiwai@suse.de>
Fri, 23 Feb 2024 08:42:38 +0000 (09:42 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 23 Feb 2024 09:57:49 +0000 (10:57 +0100)
Now we have a nice definition of CLASS(fd) that can be applied as a
clean up for the fdget/fdput pairs in snd_pcm_link().

No functional changes, only code refactoring.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20240223084241.3361-2-tiwai@suse.de
sound/core/pcm_native.c

index beee5249dae1144731b1d978bfe934b67225cf5d..0e84de4b484db534b2b0e60f067729bb730fd2a9 100644 (file)
@@ -2265,28 +2265,22 @@ static int snd_pcm_link(struct snd_pcm_substream *substream, int fd)
        struct snd_pcm_group *group __free(kfree) = NULL;
        struct snd_pcm_group *target_group;
        bool nonatomic = substream->pcm->nonatomic;
-       struct fd f = fdget(fd);
+       CLASS(fd, f)(fd);
 
        if (!f.file)
                return -EBADFD;
-       if (!is_pcm_file(f.file)) {
-               res = -EBADFD;
-               goto _badf;
-       }
+       if (!is_pcm_file(f.file))
+               return -EBADFD;
 
        pcm_file = f.file->private_data;
        substream1 = pcm_file->substream;
 
-       if (substream == substream1) {
-               res = -EINVAL;
-               goto _badf;
-       }
+       if (substream == substream1)
+               return -EINVAL;
 
        group = kzalloc(sizeof(*group), GFP_KERNEL);
-       if (!group) {
-               res = -ENOMEM;
-               goto _badf;
-       }
+       if (!group)
+               return -ENOMEM;
 
        snd_pcm_group_init(group);
 
@@ -2318,8 +2312,6 @@ static int snd_pcm_link(struct snd_pcm_substream *substream, int fd)
        snd_pcm_group_unlock_irq(target_group, nonatomic);
  _end:
        up_write(&snd_pcm_link_rwsem);
- _badf:
-       fdput(f);
        return res;
 }