svn commit: r297452 - head/sys/dev/sfxge

[Edward Tomasz Napierala]

Author: trasz
Date: Thu Mar 31 13:20:02 2016
New Revision: 297452
URL: https://svnweb.freebsd.org/changeset/base/297452

Log:
  Remove NULL checks after M_WAITOK allocations, which - by definition - can
  never return NULL.
  
  Reviewed by:	arybchik@
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D5773

Modified:
  head/sys/dev/sfxge/sfxge_mcdi.c
  head/sys/dev/sfxge/sfxge_nvram.c

Modified: head/sys/dev/sfxge/sfxge_mcdi.c
==============================================================================
--- head/sys/dev/sfxge/sfxge_mcdi.c	Thu Mar 31 13:13:38 2016	(r297451)
+++ head/sys/dev/sfxge/sfxge_mcdi.c	Thu Mar 31 13:20:02 2016	(r297452)
@@ -250,10 +250,6 @@ sfxge_mcdi_ioctl(struct sfxge_softc *sc,
 	}
 
 	mcdibuf = malloc(SFXGE_MCDI_MAX_PAYLOAD, M_TEMP, M_WAITOK | M_ZERO);
-	if (mcdibuf == NULL) {
-		rc = ENOMEM;
-		goto fail4;
-	}
 	if ((rc = copyin(ip->u.mcdi.payload, mcdibuf, ip->u.mcdi.len)) != 0) {
 		goto fail5;
 	}
@@ -292,7 +288,6 @@ sfxge_mcdi_ioctl(struct sfxge_softc *sc,
 fail6:
 fail5:
 	free(mcdibuf, M_TEMP);
-fail4:
 fail3:
 fail2:
 fail1:

Modified: head/sys/dev/sfxge/sfxge_nvram.c
==============================================================================
--- head/sys/dev/sfxge/sfxge_nvram.c	Thu Mar 31 13:13:38 2016	(r297451)
+++ head/sys/dev/sfxge/sfxge_nvram.c	Thu Mar 31 13:20:02 2016	(r297452)
@@ -75,10 +75,6 @@ sfxge_nvram_rw(struct sfxge_softc *sc, s
 		goto fail1;
 
 	buf = malloc(chunk_size, M_TEMP, M_WAITOK);
-	if (buf == NULL) {
-		rc = ENOMEM;
-		goto fail2;
-	}
 
 	off = 0;
 	while (total_size) {
@@ -108,7 +104,6 @@ sfxge_nvram_rw(struct sfxge_softc *sc, s
 
 fail3:
 	free(buf, M_TEMP);
-fail2:
 	efx_nvram_rw_finish(enp, type);
 fail1:
 	return (rc);