ALSA: usx2y: Delete an error message for a failed memory allocation in two functions
authorMarkus Elfring <elfring@users.sourceforge.net>
Fri, 11 Aug 2017 15:40:57 +0000 (17:40 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 12 Aug 2017 21:20:18 +0000 (23:20 +0200)
Omit an extra message for a memory allocation failure in these functions.

This issue was detected by using the Coccinelle software.

Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/usx2y/usbusx2yaudio.c

index dd40ca9d858a7db5a65c60bda74969196033b88a..612aa7ff7e18978d9c98b0b5befd87804cd241de 100644 (file)
@@ -419,10 +419,8 @@ static int usX2Y_urbs_allocate(struct snd_usX2Y_substream *subs)
 
        if (is_playback && NULL == subs->tmpbuf) {      /* allocate a temporary buffer for playback */
                subs->tmpbuf = kcalloc(nr_of_packs(), subs->maxpacksize, GFP_KERNEL);
-               if (NULL == subs->tmpbuf) {
-                       snd_printk(KERN_ERR "cannot malloc tmpbuf\n");
+               if (!subs->tmpbuf)
                        return -ENOMEM;
-               }
        }
        /* allocate and initialize data urbs */
        for (i = 0; i < NRURBS; i++) {
@@ -949,10 +947,9 @@ static int usX2Y_audio_stream_new(struct snd_card *card, int playback_endpoint,
        for (i = playback_endpoint ? SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE;
             i <= SNDRV_PCM_STREAM_CAPTURE; ++i) {
                usX2Y_substream[i] = kzalloc(sizeof(struct snd_usX2Y_substream), GFP_KERNEL);
-               if (NULL == usX2Y_substream[i]) {
-                       snd_printk(KERN_ERR "cannot malloc\n");
+               if (!usX2Y_substream[i])
                        return -ENOMEM;
-               }
+
                usX2Y_substream[i]->usX2Y = usX2Y(card);
        }