From nobody Mon Sep 30 04:45:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mv4f0Vz5XkN2; Mon, 30 Sep 2024 04:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mv1DSWz4FkZ; Mon, 30 Sep 2024 04:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTpo8xH9IK72iIkVnalzAm9zcYgescylT10AD1Vrs5Q=; b=sXZUlmbb+XDutiRTIcJ8JZHCIk79zaHUF2BxoYWWw5e2h/0rb0JaLOFskUMn09TPiWmfpC g5XsnuX2O2qicZPqPjUOQyXqcwoAmxRp1xdUhmiD8WzaKpD5EKCFI+DjwA2AIQW7N3XunP kRmRVq2yGOQyMG9LJ7UHyJJG4AtQhNJ7zGAt9Gpw999K+RAscIJIlw2VABOURKYdEjYtl7 mupVFnk+Ij+So2B/DDs5dYLimA8O3RUP6EnM25HSobcFSDBwxjnXag5/WSIcri7HLRTrjz 60atD6CxtfCSpa+OGGfcGM5ousBBffQjuqeNm2wwUt9KJ14Ds3SWdzbKaZiVrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTpo8xH9IK72iIkVnalzAm9zcYgescylT10AD1Vrs5Q=; b=F8wI8JLBRRSxyNCQyHeUwzRZLxJG4fHA1HjYY+5m5TVxX0BxzlGrxsQeC7PN+JVBfAbZSH Qv5oknyN34F2VWyrShO6wO3aWvuh6lzi6ub3TFl4XAybL4xlAhbJ/dfJmI8xHEUUvG7BMx onUPapQ2U60VfEXg3iGeGpB2omMSLVg6oEUB16STcUcA07rD8vbGDmVnmmlI3A4QtkOKQl xRFOCAKT2ZiWAkdAmAwkc7heScDcfub7uFz1FW46U6IgbFH3K0+4VTWLdDncG56uqkgMsz apRcrKxz/pjwaYUNk4pEvpNLIIW3mndwMwXeJgVqgCOaO7spojhkeC++KtoxIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671551; a=rsa-sha256; cv=none; b=UqxP7jg7aOu+nB5pj/4pDaNaGYLpqGpp9JBjA/48xIq3gfEaH4KW6+C0Urd18x5dE22fss yjzg00U1aGp9ffJ1PuD+Ra3EIF9P9qQbKyYyr8ZjZVXoBVIbaP9XGeeqXKpJu5zbOzHljr Q+W2RnmzBeCEpkShx6e+O3OOf9nSCMeXY9wUr8RfU87B+o3gkx1ZvQSD62yrstmv5opEok KgzAt5fEYZZR68Zd7WPT2jwPy46RCDjlgPt4Ssq+V+ZiqUh1w1OeeJhXP7kjgUhny+nP4P 9zltydlaRo8kFiHc9iRWcDeOEUdRAWSZ5MipRmOgPuRr82UmDj7kZPSoAmT/AQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XH7mv0ZG9zfbm; Mon, 30 Sep 2024 04:45:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4joGC088100; Mon, 30 Sep 2024 04:45:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jodh088097; Mon, 30 Sep 2024 04:45:50 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:50 GMT Message-Id: <202409300445.48U4jodh088097@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: bfcaaff418b8 - stable/14 - sound: Stop checking for failures from malloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bfcaaff418b856ef3d2a5be665566f62824f2f09 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=bfcaaff418b856ef3d2a5be665566f62824f2f09 commit bfcaaff418b856ef3d2a5be665566f62824f2f09 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:33 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:26 +0000 sound: Stop checking for failures from malloc(M_WAITOK) Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 59121599bbda1e4c3fc3c6e887cd48cd5e3afc70) --- sys/dev/sound/macio/i2s.c | 6 ++---- sys/dev/sound/usb/uaudio.c | 44 +++++++++++++++++++------------------------- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/sys/dev/sound/macio/i2s.c b/sys/dev/sound/macio/i2s.c index 5f8cb3aa15f7..647d66c27bba 100644 --- a/sys/dev/sound/macio/i2s.c +++ b/sys/dev/sound/macio/i2s.c @@ -241,10 +241,8 @@ i2s_attach(device_t self) * Register a hook for delayed attach in order to allow * the I2C controller to attach. */ - if ((i2s_delayed_attach = malloc(sizeof(struct intr_config_hook), - M_TEMP, M_WAITOK | M_ZERO)) == NULL) - return (ENOMEM); - + i2s_delayed_attach = malloc(sizeof(struct intr_config_hook), + M_TEMP, M_WAITOK | M_ZERO); i2s_delayed_attach->ich_func = i2s_postattach; i2s_delayed_attach->ich_arg = sc; diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index c202ac581119..8238629a2a51 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -2687,8 +2687,6 @@ uaudio_chan_init(struct uaudio_chan *ch, struct snd_dbuf *b, DPRINTF("Worst case buffer is %d bytes\n", (int)buf_size); ch->buf = malloc(buf_size, M_DEVBUF, M_WAITOK | M_ZERO); - if (ch->buf == NULL) - goto error; if (sndbuf_setup(b, ch->buf, buf_size) != 0) goto error; @@ -3256,31 +3254,27 @@ uaudio_mixer_add_ctl_sub(struct uaudio_softc *sc, struct uaudio_mixer_node *mc) malloc(sizeof(*p_mc_new), M_USBDEV, M_WAITOK); int ch; - if (p_mc_new != NULL) { - memcpy(p_mc_new, mc, sizeof(*p_mc_new)); - p_mc_new->next = sc->sc_mixer_root; - sc->sc_mixer_root = p_mc_new; - sc->sc_mixer_count++; + memcpy(p_mc_new, mc, sizeof(*p_mc_new)); + p_mc_new->next = sc->sc_mixer_root; + sc->sc_mixer_root = p_mc_new; + sc->sc_mixer_count++; - /* set default value for all channels */ - for (ch = 0; ch < p_mc_new->nchan; ch++) { - switch (p_mc_new->val_default) { - case 1: - /* 50% */ - p_mc_new->wData[ch] = (p_mc_new->maxval + p_mc_new->minval) / 2; - break; - case 2: - /* 100% */ - p_mc_new->wData[ch] = p_mc_new->maxval; - break; - default: - /* 0% */ - p_mc_new->wData[ch] = p_mc_new->minval; - break; - } + /* set default value for all channels */ + for (ch = 0; ch < p_mc_new->nchan; ch++) { + switch (p_mc_new->val_default) { + case 1: + /* 50% */ + p_mc_new->wData[ch] = (p_mc_new->maxval + p_mc_new->minval) / 2; + break; + case 2: + /* 100% */ + p_mc_new->wData[ch] = p_mc_new->maxval; + break; + default: + /* 0% */ + p_mc_new->wData[ch] = p_mc_new->minval; + break; } - } else { - DPRINTF("out of memory\n"); } }