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

2 files changed, 2 insertions, 10 deletions

diff --git a/sys/arch/mvme68k/dev/flash.c b/sys/arch/mvme68k/dev/flash.c
index 38817227130..3bafb882bea 100644
--- a/sys/arch/mvme68k/dev/flash.c
+++ b/sys/arch/mvme68k/dev/flash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: flash.c,v 1.7 2000/03/26 23:31:59 deraadt Exp $ */
+/*	$OpenBSD: flash.c,v 1.8 2001/05/16 12:49:46 ho Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -207,8 +207,6 @@ flashsavezone(sc, start)
 	u_char *zone;
 
 	zone = (u_char *)malloc(sc->sc_zonesize, M_TEMP, M_WAITOK);
-	if (!zone)
-		return (NULL);
 	sc->sc_vaddr[0] = FLCMD_RESET;
 	bcopy((u_char *)&sc->sc_vaddr[start], zone, sc->sc_zonesize);
 	return (zone);
@@ -394,8 +392,6 @@ flashwrite(dev, uio, flags)
 	int zonestart, zoneoff;
 
 	cmpbuf = (u_char *)malloc(sc->sc_zonesize, M_TEMP, M_WAITOK);
-	if (!cmpbuf)
-		return (ENOMEM);
 
 	while (uio->uio_resid > 0 && error == 0) {
 		iov = uio->uio_iov;
diff --git a/sys/arch/mvme68k/dev/vs.c b/sys/arch/mvme68k/dev/vs.c
index 933ea6b5820..068010195ac 100644
--- a/sys/arch/mvme68k/dev/vs.c
+++ b/sys/arch/mvme68k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.2 2000/06/10 19:53:23 deraadt Exp $ */
+/*	$OpenBSD: vs.c,v 1.3 2001/05/16 12:49:47 ho Exp $ */
 
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -839,10 +839,6 @@ vs_alloc_scatter_gather(void)
    M328_SG sg;
 
    MALLOC(sg, M328_SG, sizeof(struct m328_sg), M_DEVBUF, M_WAITOK);
-   assert ( sg );
-   if ( !sg ) {
-      panic ("Memory for scatter_gather_list not available");
-   }
    bzero(sg, sizeof(struct m328_sg));
 
    return (sg);