[illumos-gate merge]

commit aab83bb83be7342f6cfccaed8d5fe0b2f404855d
    6659 nvlist_free(NULL) is a no-op
commit d643a855cbd8c4fb4fe966406fa05dff70673597
    6674 sys/isa_defs.h shouldn't unconditionally define _ILP32
commit bcf23f43dc1b73080eeded927585ee86feab40a7
    6596 Macro redefined in strtolctype.h

24 files changed, 57 insertions, 121 deletions

diff --git a/usr/src/cmd/fm/fmd/common/fmd_case.c b/usr/src/cmd/fm/fmd/common/fmd_case.c
index 9ebcced1f9..dff15220a7 100644
--- a/usr/src/cmd/fm/fmd/common/fmd_case.c
+++ b/usr/src/cmd/fm/fmd/common/fmd_case.c
@@ -1322,8 +1322,7 @@ fmd_case_destroy_suspects(fmd_case_impl_t *cip)
 	if (cip->ci_proxy_asru)
 		fmd_free(cip->ci_proxy_asru, sizeof (uint8_t) *
 		    cip->ci_nsuspects);
-	if (cip->ci_diag_de)
-		nvlist_free(cip->ci_diag_de);
+	nvlist_free(cip->ci_diag_de);
 	if (cip->ci_diag_asru)
 		fmd_free(cip->ci_diag_asru, sizeof (uint8_t) *
 		    cip->ci_nsuspects);
@@ -2431,8 +2430,7 @@ fmd_case_set_de_fmri(fmd_case_t *cp, nvlist_t *nvl)
 {
 	fmd_case_impl_t *cip = (fmd_case_impl_t *)cp;
 
-	if (cip->ci_diag_de)
-		nvlist_free(cip->ci_diag_de);
+	nvlist_free(cip->ci_diag_de);
 	cip->ci_diag_de = nvl;
 }
 
diff --git a/usr/src/cmd/fm/fmd/common/fmd_event.c b/usr/src/cmd/fm/fmd/common/fmd_event.c
index b0908f0c00..d7c164354b 100644
--- a/usr/src/cmd/fm/fmd/common/fmd_event.c
+++ b/usr/src/cmd/fm/fmd/common/fmd_event.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/fm/protocol.h>
 #include <limits.h>
 
@@ -222,8 +220,7 @@ fmd_event_destroy(fmd_event_t *e)
 		break;
 	}
 
-	if (ep->ev_nvl != NULL)
-		nvlist_free(ep->ev_nvl);
+	nvlist_free(ep->ev_nvl);
 
 	fmd_free(ep, sizeof (fmd_event_impl_t));
 }
diff --git a/usr/src/cmd/fm/fmd/common/fmd_xprt.c b/usr/src/cmd/fm/fmd/common/fmd_xprt.c
index 72195c165c..8818b708ec 100644
--- a/usr/src/cmd/fm/fmd/common/fmd_xprt.c
+++ b/usr/src/cmd/fm/fmd/common/fmd_xprt.c
@@ -1158,12 +1158,9 @@ fmd_xprt_list_suspect_local(fmd_xprt_t *xp, nvlist_t *nvl)
 			if (loc)
 				topo_hdl_strfree(thp, loc);
 		}
-		if (fru)
-			nvlist_free(fru);
-		if (asru)
-			nvlist_free(asru);
-		if (rsrc)
-			nvlist_free(rsrc);
+		nvlist_free(fru);
+		nvlist_free(asru);
+		nvlist_free(rsrc);
 		fmd_fmri_topo_rele(thp);
 		fmd_case_insert_suspect(cp, flt_copy);
 	}
@@ -1327,8 +1324,7 @@ fmd_xprt_list_suspect(fmd_xprt_t *xp, nvlist_t *nvl)
 	    (xip->xi_flags & FMD_XPRT_HC_PRESENT_ONLY)) {
 		if (nelem > 0) {
 			for (i = 0; i < nelem; i++)
-				if (asrua[i])
-					nvlist_free(asrua[i]);
+				nvlist_free(asrua[i]);
 			fmd_free(proxy_asru, sizeof (uint8_t) * nelem);
 			fmd_free(diag_asru, sizeof (uint8_t) * nelem);
 			fmd_free(asrua, sizeof (nvlist_t *) * nelem);
@@ -1344,8 +1340,7 @@ fmd_xprt_list_suspect(fmd_xprt_t *xp, nvlist_t *nvl)
 	    FMD_CASE_UNSOLVED, uuid, code)) == NULL) {
 		if (nelem > 0) {
 			for (i = 0; i < nelem; i++)
-				if (asrua[i])
-					nvlist_free(asrua[i]);
+				nvlist_free(asrua[i]);
 			fmd_free(proxy_asru, sizeof (uint8_t) * nelem);
 			fmd_free(diag_asru, sizeof (uint8_t) * nelem);
 			fmd_free(asrua, sizeof (nvlist_t *) * nelem);
diff --git a/usr/src/cmd/fm/fminject/common/inj_defn.c b/usr/src/cmd/fm/fminject/common/inj_defn.c
index 1411f0ebf8..596a0b9149 100644
--- a/usr/src/cmd/fm/fminject/common/inj_defn.c
+++ b/usr/src/cmd/fm/fminject/common/inj_defn.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * After having been declared, events, FMRIs and authorities must be defined
  * (instantiated) before they can be used as the subjects of commands.
@@ -104,8 +102,7 @@ inj_defn_destroy(inj_defn_t *defn)
 	if (defn->defn_name != NULL)
 		inj_strfree(defn->defn_name);
 
-	if (defn->defn_nvl != NULL)
-		nvlist_free(defn->defn_nvl);
+	nvlist_free(defn->defn_nvl);
 
 	inj_defn_destroy_memlist(inj_list_next(&defn->defn_members));
 }
diff --git a/usr/src/cmd/fm/fmtopo/common/fmtopo.c b/usr/src/cmd/fm/fmtopo/common/fmtopo.c
index 0de419e2b1..5327cf5da9 100644
--- a/usr/src/cmd/fm/fmtopo/common/fmtopo.c
+++ b/usr/src/cmd/fm/fmtopo/common/fmtopo.c
@@ -365,8 +365,7 @@ print_prop_nameval(topo_hdl_t *thp, tnode_t *node, nvlist_t *nvl)
 			}
 uint32_def:
 			(void) printf(" 0x%x", val);
-			if (rsrc != NULL)
-				nvlist_free(rsrc);
+			nvlist_free(rsrc);
 			break;
 		}
 		case DATA_TYPE_INT64: {
diff --git a/usr/src/cmd/fm/modules/common/disk-monitor/diskmon_conf.c b/usr/src/cmd/fm/modules/common/disk-monitor/diskmon_conf.c
index d4d4fe3de9..4a4c5aa8c3 100644
--- a/usr/src/cmd/fm/modules/common/disk-monitor/diskmon_conf.c
+++ b/usr/src/cmd/fm/modules/common/disk-monitor/diskmon_conf.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Disk & Indicator Monitor configuration file support routines
  */
@@ -375,16 +373,14 @@ diskmon_free(diskmon_t *dmp)
 	while (dmp != NULL) {
 		nextp = dmp->next;
 
-		if (dmp->props)
-			nvlist_free(dmp->props);
+		nvlist_free(dmp->props);
 		if (dmp->location)
 			dstrfree(dmp->location);
 		if (dmp->ind_list)
 			ind_free(dmp->ind_list);
 		if (dmp->indrule_list)
 			indrule_free(dmp->indrule_list);
-		if (dmp->app_props)
-			nvlist_free(dmp->app_props);
+		nvlist_free(dmp->app_props);
 		if (dmp->frup)
 			dmfru_free(dmp->frup);
 		dfree(dmp, sizeof (diskmon_t));
diff --git a/usr/src/cmd/fm/modules/common/disk-monitor/topo_gather.c b/usr/src/cmd/fm/modules/common/disk-monitor/topo_gather.c
index 7580f05748..48ea360c46 100644
--- a/usr/src/cmd/fm/modules/common/disk-monitor/topo_gather.c
+++ b/usr/src/cmd/fm/modules/common/disk-monitor/topo_gather.c
@@ -707,14 +707,12 @@ topo_add_bay(topo_hdl_t *thp, tnode_t *node, walk_diskmon_t *wdp)
 		} else if (diskp != NULL) {
 			diskmon_free(diskp);
 		} else {
-			if (dmap_nvl)
-				nvlist_free(dmap_nvl);
+			nvlist_free(dmap_nvl);
 			if (indp)
 				ind_free(indp);
 			if (indrp)
 				indrule_free(indrp);
-			if (diskprops)
-				nvlist_free(diskprops);
+			nvlist_free(diskprops);
 		}
 
 		wdp->pfmri = cstr;
diff --git a/usr/src/cmd/fm/modules/common/eversholt/fme.c b/usr/src/cmd/fm/modules/common/eversholt/fme.c
index 8113230bf3..096caa73db 100644
--- a/usr/src/cmd/fm/modules/common/eversholt/fme.c
+++ b/usr/src/cmd/fm/modules/common/eversholt/fme.c
@@ -1701,8 +1701,7 @@ fme_receive_report(fmd_hdl_t *hdl, fmd_event_t *ffep,
 			ipath_print(O_ALTFP|O_NONL, eventstring, ipp);
 			out(O_ALTFP, " explained by FME%d]", fmep->id);
 
-			if (pre_peek_nvp)
-				nvlist_free(pre_peek_nvp);
+			nvlist_free(pre_peek_nvp);
 
 			if (ep->count == 1)
 				serialize_observation(fmep, eventstring, ipp);
@@ -2028,16 +2027,14 @@ node2fmri(struct node *n)
 	err = nvlist_add_nvlist_array(f, FM_FMRI_HC_LIST, pa, depth);
 	if (err == 0) {
 		for (i = 0; i < depth; i++)
-			if (pa[i] != NULL)
-				nvlist_free(pa[i]);
+			nvlist_free(pa[i]);
 		return (f);
 	}
 	failure = "addition of hc-pair array to FMRI failed";
 
 boom:
 	for (i = 0; i < depth; i++)
-		if (pa[i] != NULL)
-			nvlist_free(pa[i]);
+		nvlist_free(pa[i]);
 	nvlist_free(f);
 	out(O_DIE, "%s", failure);
 	/*NOTREACHED*/
@@ -2101,16 +2098,14 @@ ipath2fmri(struct ipath *ipath)
 	err = nvlist_add_nvlist_array(f, FM_FMRI_HC_LIST, pa, depth);
 	if (err == 0) {
 		for (i = 0; i < depth; i++)
-			if (pa[i] != NULL)
-				nvlist_free(pa[i]);
+			nvlist_free(pa[i]);
 		return (f);
 	}
 	failure = "addition of hc-pair array to FMRI failed";
 
 boom:
 	for (i = 0; i < depth; i++)
-		if (pa[i] != NULL)
-			nvlist_free(pa[i]);
+		nvlist_free(pa[i]);
 	nvlist_free(f);
 	out(O_DIE, "%s", failure);
 	/*NOTREACHED*/
@@ -2141,11 +2136,9 @@ static void publish_suspects(struct fme *fmep, struct rsl *srl);
 static void
 rslfree(struct rsl *freeme)
 {
-	if (freeme->asru != NULL)
-		nvlist_free(freeme->asru);
-	if (freeme->fru != NULL)
-		nvlist_free(freeme->fru);
-	if (freeme->rsrc != NULL && freeme->rsrc != freeme->asru)
+	nvlist_free(freeme->asru);
+	nvlist_free(freeme->fru);
+	if (freeme->rsrc != freeme->asru)
 		nvlist_free(freeme->rsrc);
 }
 
diff --git a/usr/src/cmd/fm/modules/common/eversholt/itree.c b/usr/src/cmd/fm/modules/common/eversholt/itree.c
index d27459fa05..fd32e81b0b 100644
--- a/usr/src/cmd/fm/modules/common/eversholt/itree.c
+++ b/usr/src/cmd/fm/modules/common/eversholt/itree.c
@@ -1727,8 +1727,7 @@ itree_destructor(void *left, void *right, void *arg)
 		bub = nextbub;
 	}
 
-	if (ep->nvp != NULL)
-		nvlist_free(ep->nvp);
+	nvlist_free(ep->nvp);
 	alloc_xfree(ep, sizeof (*ep));
 }
 
@@ -1759,8 +1758,7 @@ itree_pruner(void *left, void *right, void *arg)
 		bub = nextbub;
 	}
 
-	if (ep->nvp != NULL)
-		nvlist_free(ep->nvp);
+	nvlist_free(ep->nvp);
 	ep->props = NULL;
 	ep->payloadprops = NULL;
 	ep->serdprops = NULL;
diff --git a/usr/src/cmd/fm/modules/common/ext-event-transport/fmevt_inbound.c b/usr/src/cmd/fm/modules/common/ext-event-transport/fmevt_inbound.c
index a83d2e6e50..557997ecac 100644
--- a/usr/src/cmd/fm/modules/common/ext-event-transport/fmevt_inbound.c
+++ b/usr/src/cmd/fm/modules/common/ext-event-transport/fmevt_inbound.c
@@ -287,12 +287,9 @@ fmevt_detector(nvlist_t *attr, char *ruleset, int user, int priv,
 	err += nvlist_add_nvlist(dtcr, FM_FMRI_SW_CTXT, ctxt);
 
 done:
-	if (obj != NULL)
-		nvlist_free(obj);
-	if (site != NULL)
-		nvlist_free(site);
-	if (ctxt != NULL)
-		nvlist_free(ctxt);
+	nvlist_free(obj);
+	nvlist_free(site);
+	nvlist_free(ctxt);
 
 	if (err == 0) {
 		return (dtcr);
@@ -556,8 +553,7 @@ done:
 	if (ruleset)
 		free(ruleset);
 
-	if (rawattr)
-		nvlist_free(rawattr);
+	nvlist_free(rawattr);
 
 	return (0);	/* in all cases consider the event delivered */
 }
diff --git a/usr/src/cmd/fm/modules/common/ip-transport/ip.c b/usr/src/cmd/fm/modules/common/ip-transport/ip.c
index e338dd7f3e..ea05fc8c28 100644
--- a/usr/src/cmd/fm/modules/common/ip-transport/ip.c
+++ b/usr/src/cmd/fm/modules/common/ip-transport/ip.c
@@ -1056,8 +1056,7 @@ _fmd_fini(fmd_hdl_t *hdl)
 	while (ip_xps != NULL)
 		ip_xprt_destroy(ip_xps);
 
-	if (ip_auth != NULL)
-		nvlist_free(ip_auth);
+	nvlist_free(ip_auth);
 
 	ip_addr_cleanup();
 
diff --git a/usr/src/cmd/fm/modules/common/sw-diag-response/subsidiary/panic/panic_diag.c b/usr/src/cmd/fm/modules/common/sw-diag-response/subsidiary/panic/panic_diag.c
index 399f3f7676..48f9ff5dd3 100644
--- a/usr/src/cmd/fm/modules/common/sw-diag-response/subsidiary/panic/panic_diag.c
+++ b/usr/src/cmd/fm/modules/common/sw-diag-response/subsidiary/panic/panic_diag.c
@@ -182,8 +182,7 @@ panic_sw_fmri(fmd_hdl_t *hdl, char *object)
 	sw_obj = fmd_nvl_alloc(hdl, FMD_SLEEP);
 	err |= nvlist_add_string(sw_obj, FM_FMRI_SW_OBJ_PATH, object);
 	err |= nvlist_add_nvlist(fmri, FM_FMRI_SW_OBJ, sw_obj);
-	if (sw_obj)
-		nvlist_free(sw_obj);
+	nvlist_free(sw_obj);
 	if (!err)
 		return (fmri);
 	else
diff --git a/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c b/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c
index ffa3bac6a8..8f54d3493c 100644
--- a/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c
+++ b/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c
@@ -181,8 +181,7 @@ free_notify_prefs(fmd_hdl_t *hdl, nvlist_t **prefs, uint_t nprefs)
 	int i;
 
 	for (i = 0; i < nprefs; i++) {
-		if (prefs[i])
-			nvlist_free(prefs[i]);
+		nvlist_free(prefs[i]);
 	}
 
 	fmd_hdl_free(hdl, prefs, sizeof (nvlist_t *) * nprefs);
diff --git a/usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_dimm.c b/usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_dimm.c
index e7646bffa2..8422a3dcfb 100644
--- a/usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_dimm.c
+++ b/usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_dimm.c
@@ -95,8 +95,7 @@ cmd_dimm_create_fault(fmd_hdl_t *hdl, cmd_dimm_t *dimm, const char *fltnm,
 		nvlfru = cmd_mem2hc(hdl, dimm->dimm_asru_nvl);
 		flt = cmd_nvl_create_fault(hdl, fltnm, cert,
 		    dimm->dimm_asru_nvl, nvlfru, NULL);
-		if (nvlfru != NULL)
-			nvlist_free(nvlfru);
+		nvlist_free(nvlfru);
 	}
 	return (cmd_fault_add_location(hdl, flt, dimm->dimm_unum));
 #else
diff --git a/usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_pageerr.c b/usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_pageerr.c
index 187179eb96..909e098101 100644
--- a/usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_pageerr.c
+++ b/usr/src/cmd/fm/modules/sun4/cpumem-diagnosis/cmd_pageerr.c
@@ -79,8 +79,7 @@ cmd_page_fault(fmd_hdl_t *hdl, nvlist_t *modasru, nvlist_t *modfru,
 	flt = cmd_nvl_create_fault(hdl, "fault.memory.page", 100,
 	    page->page_asru_nvl, nvlfru, NULL);
 	flt = cmd_fault_add_location(hdl, flt, cmd_fmri_get_unum(modfru));
-	if (nvlfru != NULL)
-		nvlist_free(nvlfru);
+	nvlist_free(nvlfru);
 #else /* sun4v */
 	flt = cmd_nvl_create_fault(hdl, "fault.memory.page", 100,
 	    page->page_asru_nvl, modfru, NULL);
diff --git a/usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_oplerr.c b/usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_oplerr.c
index ad3e7f206d..6c3e36d981 100644
--- a/usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_oplerr.c
+++ b/usr/src/cmd/fm/modules/sun4u/cpumem-diagnosis/cmd_oplerr.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * OPL platform specific functions for
  * CPU/Memory error diagnosis engine.
@@ -180,8 +178,7 @@ cmd_opl_ue_cpu(fmd_hdl_t *hdl, fmd_event_t *ep,
 			sib_cpu = cmd_cpu_lookup(hdl, fmri, class,
 			    CMD_CPU_LEVEL_THREAD);
 			if (sib_cpu == NULL || sib_cpu->cpu_faulting) {
-				if (fmri != NULL)
-					nvlist_free(fmri);
+				nvlist_free(fmri);
 				opl_cpu->oc_cmd_cpu = NULL;
 				fmd_hdl_debug(hdl,
 				"cpu not present, cpuid %u excluded\n",
@@ -189,8 +186,7 @@ cmd_opl_ue_cpu(fmd_hdl_t *hdl, fmd_event_t *ep,
 				continue;
 			}
 			opl_cpu->oc_cmd_cpu = sib_cpu;
-			if (fmri != NULL)
-				nvlist_free(fmri);
+			nvlist_free(fmri);
 			nsusp++;
 		}
 		if (cpu->cpu_cpuid == main_cpuid) {
diff --git a/usr/src/cmd/fm/modules/sun4v/cpumem-diagnosis/cmd_hc_sun4v.c b/usr/src/cmd/fm/modules/sun4v/cpumem-diagnosis/cmd_hc_sun4v.c
index bb35892baa..967db9daef 100644
--- a/usr/src/cmd/fm/modules/sun4v/cpumem-diagnosis/cmd_hc_sun4v.c
+++ b/usr/src/cmd/fm/modules/sun4v/cpumem-diagnosis/cmd_hc_sun4v.c
@@ -200,8 +200,7 @@ cmd_mkboard_fru(fmd_hdl_t *hdl, char *frustr, char *serialstr, char *partstr) {
 
 	if (cmd_breakup_components(nac, "/", hc_list) < 0) {
 		for (i = 0; i < n; i++) {
-			if (hc_list[i] != NULL)
-			    nvlist_free(hc_list[i]);
+			nvlist_free(hc_list[i]);
 		}
 		fmd_hdl_free(hdl, hc_list, sizeof (nvlist_t *)*n);
 		fmd_hdl_free(hdl, nac, len);
@@ -210,8 +209,7 @@ cmd_mkboard_fru(fmd_hdl_t *hdl, char *frustr, char *serialstr, char *partstr) {
 
 	if (nvlist_alloc(&fru, NV_UNIQUE_NAME, 0) != 0) {
 		for (i = 0; i < n; i++) {
-			if (hc_list[i] != NULL)
-			    nvlist_free(hc_list[i]);
+			nvlist_free(hc_list[i]);
 		}
 		fmd_hdl_free(hdl, hc_list, sizeof (nvlist_t *)*n);
 		fmd_hdl_free(hdl, nac, len);
@@ -224,8 +222,7 @@ cmd_mkboard_fru(fmd_hdl_t *hdl, char *frustr, char *serialstr, char *partstr) {
 	    nvlist_add_uint32(fru, FM_FMRI_HC_LIST_SZ, n) != 0 ||
 	    nvlist_add_nvlist_array(fru, FM_FMRI_HC_LIST, hc_list, n) != 0) {
 		for (i = 0; i < n; i++) {
-			if (hc_list[i] != NULL)
-			    nvlist_free(hc_list[i]);
+			nvlist_free(hc_list[i]);
 		}
 		fmd_hdl_free(hdl, hc_list, sizeof (nvlist_t *)*n);
 		fmd_hdl_free(hdl, nac, len);
@@ -234,8 +231,7 @@ cmd_mkboard_fru(fmd_hdl_t *hdl, char *frustr, char *serialstr, char *partstr) {
 	}
 
 	for (i = 0; i < n; i++) {
-		if (hc_list[i] != NULL)
-		    nvlist_free(hc_list[i]);
+		nvlist_free(hc_list[i]);
 	}
 	fmd_hdl_free(hdl, hc_list, sizeof (nvlist_t *)*n);
 	fmd_hdl_free(hdl, nac, len);
@@ -272,8 +268,7 @@ cmd_boardfru_create_fault(fmd_hdl_t *hdl, nvlist_t *asru, const char *fltnm,
 
 	flt = cmd_nvl_create_fault(hdl, fltnm, cert, nvlfru, nvlfru, NULL);
 	flt = cmd_fault_add_location(hdl, flt, loc);
-	if (nvlfru != NULL)
-		nvlist_free(nvlfru);
+	nvlist_free(nvlfru);
 	return (flt);
 }
 
@@ -638,16 +633,14 @@ cmd_nvl_create_fault(fmd_hdl_t *hdl, const char *class, uint8_t cert,
 		}
 		fllist = fmd_nvl_create_fault(hdl, class, cert, asru,
 		    fru, rsrc);
-		if (hsp != NULL)
-			nvlist_free(hsp);
+		nvlist_free(hsp);
 	} else {
 		rsrc = get_cpu_fault_resource(hdl, asru);
 		fllist = fmd_nvl_create_fault(hdl, class, cert, asru,
 		    fru, rsrc);
 	}
 
-	if (rsrc != NULL)
-		nvlist_free(rsrc);
+	nvlist_free(rsrc);
 
 	return (fllist);
 }
diff --git a/usr/src/cmd/fm/modules/sun4v/cpumem-diagnosis/cmd_memerr_arch.c b/usr/src/cmd/fm/modules/sun4v/cpumem-diagnosis/cmd_memerr_arch.c
index 320c02e35d..b8005adff2 100644
--- a/usr/src/cmd/fm/modules/sun4v/cpumem-diagnosis/cmd_memerr_arch.c
+++ b/usr/src/cmd/fm/modules/sun4v/cpumem-diagnosis/cmd_memerr_arch.c
@@ -524,8 +524,7 @@ cmd_fw_defect(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl, const char *class,
 		}
 	}
 
-	if (rsc)
-		nvlist_free(rsc);
+	nvlist_free(rsc);
 
 	return (solve ? CMD_EVD_OK : CMD_EVD_UNUSED);
 }
diff --git a/usr/src/cmd/fm/modules/sun4v/cpumem-retire/cma_cpu_sun4v.c b/usr/src/cmd/fm/modules/sun4v/cpumem-retire/cma_cpu_sun4v.c
index ccc942bfb0..a70af3904d 100644
--- a/usr/src/cmd/fm/modules/sun4v/cpumem-retire/cma_cpu_sun4v.c
+++ b/usr/src/cmd/fm/modules/sun4v/cpumem-retire/cma_cpu_sun4v.c
@@ -262,8 +262,7 @@ cpu_retry(fmd_hdl_t *hdl, cma_cpu_t *cpu)
 static void
 cma_cpu_free(fmd_hdl_t *hdl, cma_cpu_t *cpu)
 {
-	if (cpu->cpu_fmri != NULL)
-		nvlist_free(cpu->cpu_fmri);
+	nvlist_free(cpu->cpu_fmri);
 	if (cpu->cpu_uuid != NULL)
 		fmd_hdl_strfree(hdl, cpu->cpu_uuid);
 	fmd_hdl_free(hdl, cpu, sizeof (cma_cpu_t));
diff --git a/usr/src/cmd/fm/modules/sun4v/generic-mem/gmem_dimm.c b/usr/src/cmd/fm/modules/sun4v/generic-mem/gmem_dimm.c
index af894b9339..c64ab7ccfe 100644
--- a/usr/src/cmd/fm/modules/sun4v/generic-mem/gmem_dimm.c
+++ b/usr/src/cmd/fm/modules/sun4v/generic-mem/gmem_dimm.c
@@ -482,8 +482,7 @@ gmem_dimm_present(fmd_hdl_t *hdl, nvlist_t *asru)
 		fmd_hdl_debug(hdl, "Dimm sn=%s is not present\n", sn);
 		return (0);
 	}
-	if (dimm != NULL)
-		nvlist_free(dimm);
+	nvlist_free(dimm);
 	return (1);
 }
 
diff --git a/usr/src/cmd/fm/modules/sun4v/generic-mem/gmem_memerr.c b/usr/src/cmd/fm/modules/sun4v/generic-mem/gmem_memerr.c
index 7252fe395d..63edd68945 100644
--- a/usr/src/cmd/fm/modules/sun4v/generic-mem/gmem_memerr.c
+++ b/usr/src/cmd/fm/modules/sun4v/generic-mem/gmem_memerr.c
@@ -199,8 +199,7 @@ gmem_gen_datapath_fault(fmd_hdl_t *hdl, nvlist_t *det)
 
 	if (nvlist_alloc(&rsrc,  NV_UNIQUE_NAME|NV_UNIQUE_NAME_TYPE, 0) != 0) {
 		for (i = 0; i < n; i++) {
-			if (hcl[i] != NULL)
-				nvlist_free(hcl[i]);
+			nvlist_free(hcl[i]);
 		}
 		fmd_hdl_free(hdl, hcl, sizeof (nvlist_t *) * n);
 	}
@@ -211,8 +210,7 @@ gmem_gen_datapath_fault(fmd_hdl_t *hdl, nvlist_t *det)
 	    nvlist_add_uint32(rsrc, FM_FMRI_HC_LIST_SZ, n) != 0 ||
 	    nvlist_add_nvlist_array(rsrc, FM_FMRI_HC_LIST, hcl, n) != 0) {
 		for (i = 0; i < n; i++) {
-			if (hcl[i] != NULL)
-				nvlist_free(hcl[i]);
+			nvlist_free(hcl[i]);
 		}
 		fmd_hdl_free(hdl, hcl, sizeof (nvlist_t *) * n);
 		nvlist_free(rsrc);
@@ -229,8 +227,7 @@ gmem_gen_datapath_fault(fmd_hdl_t *hdl, nvlist_t *det)
 	}
 
 	for (i = 0; i < n; i++) {
-		if (hcl[i] != NULL)
-			nvlist_free(hcl[i]);
+		nvlist_free(hcl[i]);
 	}
 
 	fmd_hdl_free(hdl, hcl, sizeof (nvlist_t *) * n);
@@ -399,8 +396,7 @@ ce_thresh_check(fmd_hdl_t *hdl, gmem_dimm_t *dimm)
 		    GMEM_FLTMAXCONF, NULL, gmem_dimm_fru(dimm), rsrc);
 		fmd_case_add_suspect(hdl, cp, flt);
 		fmd_case_solve(hdl, cp);
-		if (rsrc != NULL)
-			nvlist_free(rsrc);
+		nvlist_free(rsrc);
 	}
 }
 
@@ -435,8 +431,7 @@ mq_5b_check(fmd_hdl_t *hdl, gmem_dimm_t *dimm)
 				gmem_dimm_dirty(hdl, dimm);
 				fmd_case_add_suspect(hdl, cp, flt);
 				fmd_case_solve(hdl, cp);
-				if (rsrc != NULL)
-					nvlist_free(rsrc);
+				nvlist_free(rsrc);
 				return;
 			}
 		}
@@ -705,8 +700,7 @@ mq_check(fmd_hdl_t *hdl, gmem_dimm_t *dimm)
 			gmem_dimm_dirty(hdl, dimm);
 			fmd_case_add_suspect(hdl, dimm->dimm_case.cc_cp, flt);
 			fmd_case_solve(hdl, dimm->dimm_case.cc_cp);
-			if (rsc != NULL)
-				nvlist_free(rsc);
+			nvlist_free(rsc);
 			return;
 		}
 		upos_pairs = i;
diff --git a/usr/src/cmd/fm/modules/sun4v/generic-mem/gmem_page.c b/usr/src/cmd/fm/modules/sun4v/generic-mem/gmem_page.c
index c453f86311..e71a03df48 100644
--- a/usr/src/cmd/fm/modules/sun4v/generic-mem/gmem_page.c
+++ b/usr/src/cmd/fm/modules/sun4v/generic-mem/gmem_page.c
@@ -271,8 +271,7 @@ gmem_page_unusable(fmd_hdl_t *hdl, gmem_page_t *page)
 		return (1);
 	}
 
-	if (asru != NULL)
-		nvlist_free(asru);
+	nvlist_free(asru);
 
 	return (0);
 }
@@ -326,8 +325,7 @@ gmem_page_fault(fmd_hdl_t *hdl, nvlist_t *fru, nvlist_t *rsc,
 	if (page != NULL) {
 		if (page->page_flags & GMEM_F_FAULTING ||
 		    gmem_page_unusable(hdl, page)) {
-			if (rsc != NULL)
-				nvlist_free(rsc);
+			nvlist_free(rsc);
 			page->page_flags |= GMEM_F_FAULTING;
 			return (0);
 		}
@@ -345,8 +343,7 @@ gmem_page_fault(fmd_hdl_t *hdl, nvlist_t *fru, nvlist_t *rsc,
 		(void) nvlist_add_nvlist(rsc, FM_FMRI_HC_SPECIFIC, hsp);
 
 	flt = fmd_nvl_create_fault(hdl, GMEM_FAULT_PAGE, 100, NULL, fru, rsc);
-	if (rsc != NULL)
-		nvlist_free(rsc);
+	nvlist_free(rsc);
 
 	if (nvlist_add_boolean_value(flt, FM_SUSPECT_MESSAGE, B_FALSE) != 0)
 		fmd_hdl_abort(hdl, "failed to add no-message member to fault");
diff --git a/usr/src/cmd/fm/schemes/hc/scheme.c b/usr/src/cmd/fm/schemes/hc/scheme.c
index ce290d8b6f..b0f7640ed7 100644
--- a/usr/src/cmd/fm/schemes/hc/scheme.c
+++ b/usr/src/cmd/fm/schemes/hc/scheme.c
@@ -227,10 +227,8 @@ fru_compare(nvlist_t *r1, nvlist_t *r2)
 	}
 
 	fmd_fmri_topo_rele(thp);
-	if (f1 != NULL)
-		nvlist_free(f1);
-	if (f2 != NULL)
-		nvlist_free(f2);
+	nvlist_free(f1);
+	nvlist_free(f2);
 	return (rc);
 }
 
diff --git a/usr/src/cmd/fm/schemes/mem/mem.c b/usr/src/cmd/fm/schemes/mem/mem.c
index 20f863d598..4bcdda362c 100644
--- a/usr/src/cmd/fm/schemes/mem/mem.c
+++ b/usr/src/cmd/fm/schemes/mem/mem.c
@@ -525,8 +525,7 @@ fmd_fmri_unusable(nvlist_t *nvl)
 		retval = 1;
 	}
 
-	if (nvlcp)
-		nvlist_free(nvlcp);
+	nvlist_free(nvlcp);
 
 	return (retval);
 }