No need to check M_WAIT/M_WAITOK malloc return values. (art@ ok)

3 files changed, 3 insertions, 17 deletions

diff --git a/sys/arch/sparc/dev/isp_sbus.c b/sys/arch/sparc/dev/isp_sbus.c
index 6f52ca6f6be..ccbe0d68712 100644
--- a/sys/arch/sparc/dev/isp_sbus.c
+++ b/sys/arch/sparc/dev/isp_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isp_sbus.c,v 1.16 2001/04/04 22:06:22 mjacob Exp $	*/
+/*	$OpenBSD: isp_sbus.c,v 1.17 2001/05/16 12:49:48 ho Exp $	*/
 /*
  * SBus specific probe and attach routines for Qlogic ISP SCSI adapters.
  *
@@ -302,17 +302,9 @@ isp_sbus_mbxdma(struct ispsoftc *isp)
 
 	len = isp->isp_maxcmds * sizeof (XS_T);
 	isp->isp_xflist = (XS_T **) malloc(len, M_DEVBUF, M_WAITOK);
-	if (isp->isp_xflist == NULL) {
-		printf("%s: cannot malloc xflist array\n", isp->isp_name);
-		return (1);
-	}
 	bzero(isp->isp_xflist, len);
 	len = isp->isp_maxcmds * sizeof (vaddr_t);
 	sbc->sbus_kdma_allocs = (vaddr_t *) malloc(len, M_DEVBUF, M_WAITOK);
-	if (sbc->sbus_kdma_allocs == NULL) {
-		printf("%s: cannot malloc sbus_kdma_allocs\n", isp->isp_name);
-		return (1);
-	}
 	bzero(sbc->sbus_kdma_allocs, len);
 
 	/*
diff --git a/sys/arch/sparc/dev/magma.c b/sys/arch/sparc/dev/magma.c
index dca22b6734c..5571f99a977 100644
--- a/sys/arch/sparc/dev/magma.c
+++ b/sys/arch/sparc/dev/magma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: magma.c,v 1.7 2001/03/24 10:07:19 ho Exp $	*/
+/*	$OpenBSD: magma.c,v 1.8 2001/05/16 12:49:48 ho Exp $	*/
 /*
  * magma.c
  *
@@ -1591,8 +1591,6 @@ int gotdata = 0;
 
 	buflen = min(uio->uio_resid, mp->mp_burst);
 	buffer = malloc(buflen, M_DEVBUF, M_WAITOK);
-	if( buffer == NULL )
-		return(ENOMEM);
 
 	SET(mp->mp_flags, MBPPF_UIO);
 
diff --git a/sys/arch/sparc/sparc/clock.c b/sys/arch/sparc/sparc/clock.c
index dbf34309535..e84b775060e 100644
--- a/sys/arch/sparc/sparc/clock.c
+++ b/sys/arch/sparc/sparc/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.13 1999/09/29 13:54:03 art Exp $	*/
+/*	$OpenBSD: clock.c,v 1.14 2001/05/16 12:49:48 ho Exp $	*/
 /*	$NetBSD: clock.c,v 1.52 1997/05/24 20:16:05 pk Exp $ */
 
 /*
@@ -1261,10 +1261,6 @@ eeprom_uio(uio)
 	 * temporary buffer.
 	 */
 	buf = malloc(EEPROM_SIZE, M_DEVBUF, M_WAITOK);
-	if (buf == NULL) {
-		error = EAGAIN;
-		goto out;
-	}
 
 	if (uio->uio_rw == UIO_READ)
 		for (bcnt = 0; bcnt < EEPROM_SIZE; ++bcnt)