svn commit: r299849 - head/sys/dev/isp
Edward Tomasz Napierala
trasz at FreeBSD.org
Sun May 15 08:36:14 UTC 2016
Author: trasz
Date: Sun May 15 08:36:12 2016
New Revision: 299849
URL: https://svnweb.freebsd.org/changeset/base/299849
Log:
Remove NULL checks after M_WAITOK allocations from isp(4).
MFC after: 1 month
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/isp/isp_pci.c
head/sys/dev/isp/isp_sbus.c
Modified: head/sys/dev/isp/isp_pci.c
==============================================================================
--- head/sys/dev/isp/isp_pci.c Sun May 15 08:34:59 2016 (r299848)
+++ head/sys/dev/isp/isp_pci.c Sun May 15 08:36:12 2016 (r299849)
@@ -1593,11 +1593,6 @@ isp_pci_mbxdma(ispsoftc_t *isp)
len = isp->isp_maxcmds * sizeof (struct isp_pcmd);
isp->isp_osinfo.pcmd_pool = (struct isp_pcmd *) malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
- if (isp->isp_osinfo.pcmd_pool == NULL) {
- isp_prt(isp, ISP_LOGERR, "cannot allocate pcmds");
- ISP_LOCK(isp);
- return (1);
- }
if (isp->isp_osinfo.sixtyfourbit) {
nsegs = ISP_NSEG64_MAX;
@@ -1614,12 +1609,6 @@ isp_pci_mbxdma(ispsoftc_t *isp)
len = sizeof (isp_hdl_t) * isp->isp_maxcmds;
isp->isp_xflist = (isp_hdl_t *) malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
- if (isp->isp_xflist == NULL) {
- free(isp->isp_osinfo.pcmd_pool, M_DEVBUF);
- ISP_LOCK(isp);
- isp_prt(isp, ISP_LOGERR, "cannot alloc xflist array");
- return (1);
- }
for (len = 0; len < isp->isp_maxcmds - 1; len++) {
isp->isp_xflist[len].cmd = &isp->isp_xflist[len+1];
}
Modified: head/sys/dev/isp/isp_sbus.c
==============================================================================
--- head/sys/dev/isp/isp_sbus.c Sun May 15 08:34:59 2016 (r299848)
+++ head/sys/dev/isp/isp_sbus.c Sun May 15 08:36:12 2016 (r299849)
@@ -448,19 +448,8 @@ isp_sbus_mbxdma(ispsoftc_t *isp)
len = sizeof (struct isp_pcmd) * isp->isp_maxcmds;
isp->isp_osinfo.pcmd_pool = (struct isp_pcmd *)
malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
- if (isp->isp_osinfo.pcmd_pool == NULL) {
- isp_prt(isp, ISP_LOGERR, "cannot alloc pcmd pool");
- ISP_LOCK(isp);
- return (1);
- }
-
len = sizeof (isp_hdl_t *) * isp->isp_maxcmds;
isp->isp_xflist = (isp_hdl_t *) malloc(len, M_DEVBUF, M_WAITOK | M_ZERO);
- if (isp->isp_xflist == NULL) {
- isp_prt(isp, ISP_LOGERR, "cannot alloc xflist array");
- ISP_LOCK(isp);
- return (1);
- }
for (len = 0; len < isp->isp_maxcmds - 1; len++) {
isp->isp_xflist[len].cmd = &isp->isp_xflist[len+1];
}
More information about the svn-src-all
mailing list