Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 28 Mar 2017 10:15:30 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r316085 - stable/10/sys/dev/isp
Message-ID:  <201703281015.v2SAFUg0014025@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mav
Date: Tue Mar 28 10:15:30 2017
New Revision: 316085
URL: https://svnweb.freebsd.org/changeset/base/316085

Log:
  MFC r299849 (by trasz):
  Remove NULL checks after M_WAITOK allocations from isp(4).

Modified:
  stable/10/sys/dev/isp/isp_pci.c
  stable/10/sys/dev/isp/isp_sbus.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/isp/isp_pci.c
==============================================================================
--- stable/10/sys/dev/isp/isp_pci.c	Tue Mar 28 10:11:00 2017	(r316084)
+++ stable/10/sys/dev/isp/isp_pci.c	Tue Mar 28 10:15:30 2017	(r316085)
@@ -1600,11 +1600,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;
@@ -1621,12 +1616,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: stable/10/sys/dev/isp/isp_sbus.c
==============================================================================
--- stable/10/sys/dev/isp/isp_sbus.c	Tue Mar 28 10:11:00 2017	(r316084)
+++ stable/10/sys/dev/isp/isp_sbus.c	Tue Mar 28 10:15:30 2017	(r316085)
@@ -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];
 	}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703281015.v2SAFUg0014025>