git: 140a0c8f3981 - stable/14 - sume(4): Stop checking for failures from malloc(M_WAITOK)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 30 Sep 2024 04:45:49 UTC
The branch stable/14 has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=140a0c8f39816648719d9670fb641c657732439e
commit 140a0c8f39816648719d9670fb641c657732439e
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:33 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-30 04:44:26 +0000
sume(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
(cherry picked from commit 761339c5544a360df9d3bab70675fea246eb6a83)
---
sys/dev/sume/if_sume.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/sys/dev/sume/if_sume.c b/sys/dev/sume/if_sume.c
index 4113af5a48b3..b6a8eb62219e 100644
--- a/sys/dev/sume/if_sume.c
+++ b/sys/dev/sume/if_sume.c
@@ -1196,16 +1196,11 @@ sume_probe_riffa_buffer(const struct sume_adapter *adapter,
{
struct riffa_chnl_dir **rp;
bus_addr_t hw_addr;
- int error, ch;
+ int ch;
device_t dev = adapter->dev;
- error = ENOMEM;
*p = malloc(SUME_RIFFA_CHANNELS * sizeof(struct riffa_chnl_dir *),
M_SUME, M_ZERO | M_WAITOK);
- if (*p == NULL) {
- device_printf(dev, "malloc(%s) failed.\n", dir);
- return (error);
- }
rp = *p;
/* Allocate the chnl_dir structs themselves. */
@@ -1213,11 +1208,6 @@ sume_probe_riffa_buffer(const struct sume_adapter *adapter,
/* One direction. */
rp[ch] = malloc(sizeof(struct riffa_chnl_dir), M_SUME,
M_ZERO | M_WAITOK);
- if (rp[ch] == NULL) {
- device_printf(dev, "malloc(%s[%d]) riffa_chnl_dir "
- "failed.\n", dir, ch);
- return (error);
- }
int err = bus_dma_tag_create(bus_get_dma_tag(dev),
4, 0,