6659 nvlist_free(NULL) is a no-op

Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Marcel Telka <marcel@telka.sk>
Approved by: Robert Mustacchi <rm@joyent.com>

113 files changed, 241 insertions, 513 deletions

diff --git a/usr/src/cmd/beadm/beadm.c b/usr/src/cmd/beadm/beadm.c
index abe79f2a3d..1341c3ad6d 100644
--- a/usr/src/cmd/beadm/beadm.c
+++ b/usr/src/cmd/beadm/beadm.c
@@ -946,8 +946,7 @@ be_do_create(int argc, char **argv)
 out:
 	nvlist_free(be_attrs);
 out2:
-	if (zfs_props != NULL)
-		nvlist_free(zfs_props);
+	nvlist_free(zfs_props);
 
 	return (err);
 }
diff --git a/usr/src/cmd/boot/bootadm/bootadm.c b/usr/src/cmd/boot/bootadm/bootadm.c
index a6992badb0..c520301579 100644
--- a/usr/src/cmd/boot/bootadm/bootadm.c
+++ b/usr/src/cmd/boot/bootadm/bootadm.c
@@ -3032,10 +3032,8 @@ savenew(char *root)
 static void
 clear_walk_args(void)
 {
-	if (walk_arg.old_nvlp)
-		nvlist_free(walk_arg.old_nvlp);
-	if (walk_arg.new_nvlp)
-		nvlist_free(walk_arg.new_nvlp);
+	nvlist_free(walk_arg.old_nvlp);
+	nvlist_free(walk_arg.new_nvlp);
 	if (walk_arg.sparcfile)
 		(void) fclose(walk_arg.sparcfile);
 	walk_arg.old_nvlp = NULL;
diff --git a/usr/src/cmd/cmd-inet/sbin/dhcpagent/defaults.c b/usr/src/cmd/cmd-inet/sbin/dhcpagent/defaults.c
index 6a44ca3d4a..0381f0c080 100644
--- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/defaults.c
+++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/defaults.c
@@ -186,8 +186,7 @@ df_get_string(const char *if_name, boolean_t isv6, uint_t param)
 	if (statbuf.st_mtime != df_statbuf.st_mtime ||
 	    statbuf.st_size != df_statbuf.st_size) {
 		df_statbuf = statbuf;
-		if (df_nvlist != NULL)
-			nvlist_free(df_nvlist);
+		nvlist_free(df_nvlist);
 		df_nvlist = df_build_cache();
 	}
 
diff --git a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.c b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.c
index 096ef2422b..9269e9b94f 100644
--- a/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.c
+++ b/usr/src/cmd/cmd-inet/usr.lib/vrrpd/vrrpd.c
@@ -4472,8 +4472,7 @@ failed:
 	    "sysevent posting failed: %s", vrrp_state2str(prev_st),
 	    vrrp_state2str(st), strerror(errno));
 
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	return (-1);
 }
 
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/ipqosconf.c b/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/ipqosconf.c
index 82e6ef8dd2..975adc4a7b 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/ipqosconf.c
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/ipqosconf.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /* enable debug output and some debug asserts */
 #undef	_IPQOS_CONF_DEBUG
 
@@ -622,8 +620,7 @@ char *first_action)
 
 	return (IPQOS_CONF_SUCCESS);
 fail:
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	return (IPQOS_CONF_ERR);
 }
 
@@ -711,8 +708,7 @@ enum ipp_flags flags)
 
 	return (IPQOS_CONF_SUCCESS);
 fail:
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	return (IPQOS_CONF_ERR);
 }
 
@@ -776,8 +772,7 @@ enum ipp_flags flags)
 
 	return (IPQOS_CONF_SUCCESS);
 fail:
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	return (IPQOS_CONF_ERR);
 }
 
@@ -6345,8 +6340,7 @@ free_class(ipqos_conf_class_t *cls)
 
 	/* free its nvlist if present */
 
-	if (cls->nvlist)
-		nvlist_free(cls->nvlist);
+	nvlist_free(cls->nvlist);
 
 	/* free its action refs if present */
 
@@ -6790,8 +6784,7 @@ ipqos_conf_act_ref_t *arefs)
 	ipqos_conf_act_ref_t *next;
 
 	while (aref) {
-		if (aref->nvlist)
-			nvlist_free(aref->nvlist);
+		nvlist_free(aref->nvlist);
 		next = aref->next;
 		free(aref);
 		aref = next;
diff --git a/usr/src/cmd/dcs/sparc/sun4u/ri_init.c b/usr/src/cmd/dcs/sparc/sun4u/ri_init.c
index 8ec974a90e..164140fa7c 100644
--- a/usr/src/cmd/dcs/sparc/sun4u/ri_init.c
+++ b/usr/src/cmd/dcs/sparc/sun4u/ri_init.c
@@ -731,8 +731,7 @@ cpu_cap_request(ri_hdl_t *ri_hdl, rcmd_t *rcm)
 out:
 	s_free(syscpuids);
 	s_free(newcpuids);
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	if (rcm_info != NULL)
 		rcm_free_info(rcm_info);
 
@@ -1771,8 +1770,7 @@ ri_ap_alloc(char *ap_id, ri_hdl_t *hdl)
 
 	if (nvlist_alloc(&ap->conf_props, NV_UNIQUE_NAME, 0) != 0 ||
 	    nvlist_add_string(ap->conf_props, RI_AP_REQ_ID, ap_id) != 0) {
-		if (ap->conf_props != NULL)
-			nvlist_free(ap->conf_props);
+		nvlist_free(ap->conf_props);
 		free(ap);
 		return (NULL);
 	}
diff --git a/usr/src/cmd/dcs/sparc/sun4u/rsrc_info.c b/usr/src/cmd/dcs/sparc/sun4u/rsrc_info.c
index 2587613f89..9d954fc4d4 100644
--- a/usr/src/cmd/dcs/sparc/sun4u/rsrc_info.c
+++ b/usr/src/cmd/dcs/sparc/sun4u/rsrc_info.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Routines for traversing and packing/unpacking the handle
  * returned from ri_init.
@@ -82,8 +80,7 @@ ri_ap_free(ri_ap_t *ap)
 
 	assert(ap != NULL);
 
-	if (ap->conf_props != NULL)
-		nvlist_free(ap->conf_props);
+	nvlist_free(ap->conf_props);
 
 	while ((dev = ap->cpus) != NULL) {
 		ap->cpus = dev->next;
@@ -120,10 +117,8 @@ ri_client_free(ri_client_t *client)
 {
 	assert(client != NULL);
 
-	if (client->usg_props != NULL)
-		nvlist_free(client->usg_props);
-	if (client->v_props != NULL)
-		nvlist_free(client->v_props);
+	nvlist_free(client->usg_props);
+	nvlist_free(client->v_props);
 	free(client);
 }
 
@@ -196,8 +191,7 @@ ri_pack(ri_hdl_t *hdl, caddr_t *bufp, size_t *sizep, int encoding)
 
 fail:
 	s_free(buf);
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	return (RI_FAILURE);
 }
@@ -250,8 +244,7 @@ ap_list_pack(ri_ap_t *aplist, char **bufp, size_t *sizep, int encoding)
 
 fail:
 	s_free(buf);
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	return (-1);
 }
@@ -304,8 +297,7 @@ dev_list_pack(ri_dev_t *devlist, char **bufp, size_t *sizep, int encoding)
 
 fail:
 	s_free(buf);
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	return (-1);
 }
@@ -359,8 +351,7 @@ client_list_pack(ri_client_t *client_list, char **bufp, size_t *sizep,
 
 fail:
 	s_free(buf);
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	return (-1);
 }
@@ -424,8 +415,7 @@ ap_pack(ri_ap_t *ap, char **bufp, size_t *sizep, int encoding)
 
 fail:
 	s_free(buf);
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	return (-1);
 }
@@ -470,8 +460,7 @@ dev_pack(ri_dev_t *dev, char **bufp, size_t *sizep, int encoding)
 
 fail:
 	s_free(buf);
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	return (-1);
 }
@@ -515,8 +504,7 @@ client_pack(ri_client_t *client, char **bufp, size_t *sizep, int encoding)
 
 fail:
 	s_free(buf);
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	return (-1);
 }
@@ -617,8 +605,7 @@ ri_unpack(caddr_t buf, size_t size, ri_hdl_t **hdlp)
 
 fail:
 	free(ri_hdl);
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	return (-1);
 }
@@ -671,8 +658,7 @@ ap_list_unpack(char *buf, size_t size, ri_ap_t **aps)
 	return (0);
 
 fail:
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	if (aplist != NULL) {
 		while ((tmp = aplist) != NULL) {
 			aplist = aplist->next;
@@ -729,8 +715,7 @@ dev_list_unpack(char *buf, size_t size, ri_dev_t **devs)
 	return (0);
 
 fail:
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	if (devlist != NULL) {
 		while ((tmp = devlist) != NULL) {
 			devlist = devlist->next;
@@ -789,8 +774,7 @@ client_list_unpack(char *buf, size_t size, ri_client_t **clients)
 	return (0);
 
 fail:
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	if (client_list != NULL) {
 		while ((tmp = client_list) != NULL) {
 			client_list = client_list->next;
diff --git a/usr/src/cmd/devfsadm/devfsadm.c b/usr/src/cmd/devfsadm/devfsadm.c
index 2289db2a88..448554a5e0 100644
--- a/usr/src/cmd/devfsadm/devfsadm.c
+++ b/usr/src/cmd/devfsadm/devfsadm.c
@@ -8290,8 +8290,7 @@ build_event_attributes(char *class, char *subclass, char *node_path,
 	return (nvl);
 
 out:
-	if (nvl)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	if (dev_name)
 		free(dev_name);
@@ -8364,8 +8363,7 @@ process_syseventq()
 			free(tmp->class);
 		if (tmp->subclass != NULL)
 			free(tmp->subclass);
-		if (tmp->nvl != NULL)
-			nvlist_free(tmp->nvl);
+		nvlist_free(tmp->nvl);
 		syseventq_back = syseventq_back->next;
 		if (syseventq_back == NULL)
 			syseventq_front = NULL;
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);
 }
diff --git a/usr/src/cmd/fs.d/nfs/mountd/mountd.c b/usr/src/cmd/fs.d/nfs/mountd/mountd.c
index 150455f3d9..7204cd5f46 100644
--- a/usr/src/cmd/fs.d/nfs/mountd/mountd.c
+++ b/usr/src/cmd/fs.d/nfs/mountd/mountd.c
@@ -1529,10 +1529,8 @@ same_file_system(const char *path1, const char *path2)
 		return (B_FALSE);
 	}
 
-	if (nvl1 != NULL)
-		nvlist_free(nvl1);
-	if (nvl2 != NULL)
-		nvlist_free(nvl2);
+	nvlist_free(nvl1);
+	nvlist_free(nvl2);
 
 	/*
 	 * We were unable to find fsid's for at least one of the paths.
diff --git a/usr/src/cmd/hotplugd/hotplugd_door.c b/usr/src/cmd/hotplugd/hotplugd_door.c
index 6d0ec7f26a..28fd69f864 100644
--- a/usr/src/cmd/hotplugd/hotplugd_door.c
+++ b/usr/src/cmd/hotplugd/hotplugd_door.c
@@ -253,10 +253,8 @@ door_server(void *cookie, char *argp, size_t sz, door_desc_t *dp, uint_t ndesc)
 
 fail:
 	log_err("Door call failed (%s)\n", strerror(rv));
-	if (args != NULL)
-		nvlist_free(args);
-	if (results != NULL)
-		nvlist_free(results);
+	nvlist_free(args);
+	nvlist_free(results);
 	(void) door_return((char *)&rv, sizeof (int), NULL, 0);
 }
 
diff --git a/usr/src/cmd/mv/mv.c b/usr/src/cmd/mv/mv.c
index be83ed7a8a..c82887a807 100644
--- a/usr/src/cmd/mv/mv.c
+++ b/usr/src/cmd/mv/mv.c
@@ -1959,8 +1959,7 @@ next:
 			if (targattrfd != -1)
 				(void) close(targattrfd);
 			srcattrfd = targattrfd = -1;
-			if (res != NULL)
-				nvlist_free(res);
+			nvlist_free(res);
 		}
 	}
 	/* Copy source file non default extended system attributes to target */
@@ -1972,8 +1971,7 @@ next:
 		    "%s to %s\n"), cmd, source, target);
 	}
 out:
-	if (response != NULL)
-		nvlist_free(response);
+	nvlist_free(response);
 	close_all();
 	return (error == 0 ? 0 : 1);
 }
diff --git a/usr/src/cmd/pcidr/pcidr.c b/usr/src/cmd/pcidr/pcidr.c
index 1940f604d2..f25d202e53 100755
--- a/usr/src/cmd/pcidr/pcidr.c
+++ b/usr/src/cmd/pcidr/pcidr.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -255,8 +253,7 @@ ERR_ARG:
 		*eqp = '=';
 	dprint(DDEBUG, "%s: bad attribute argv[%d]: \"%s\"\n", fn, i, argv[i]);
 ERR:
-	if (attrlistp != NULL)
-		nvlist_free(attrlistp);
+	nvlist_free(attrlistp);
 	return (NULL);
 }
 
diff --git a/usr/src/cmd/picl/plugins/common/devtree/picldevtree.c b/usr/src/cmd/picl/plugins/common/devtree/picldevtree.c
index 2c439ed505..3a0327af3f 100644
--- a/usr/src/cmd/picl/plugins/common/devtree/picldevtree.c
+++ b/usr/src/cmd/picl/plugins/common/devtree/picldevtree.c
@@ -3631,8 +3631,7 @@ picldevtree_evhandler(const char *ename, const void *earg, size_t size,
 	    nvlist_lookup_string(nvlp, PICLEVENTARG_DEVFS_PATH, &devfs_path) ||
 	    strlen(devfs_path) > (PATH_MAX - sizeof (PLATFORM_PATH))) {
 		syslog(LOG_INFO, PICL_EVENT_DROPPED, ename);
-		if (nvlp)
-			nvlist_free(nvlp);
+		nvlist_free(nvlp);
 		return;
 	}
 
diff --git a/usr/src/cmd/picl/plugins/sun4v/piclsbl/piclsbl.c b/usr/src/cmd/picl/plugins/sun4v/piclsbl/piclsbl.c
index 6b84234b53..e70ea55d54 100644
--- a/usr/src/cmd/picl/plugins/sun4v/piclsbl/piclsbl.c
+++ b/usr/src/cmd/picl/plugins/sun4v/piclsbl/piclsbl.c
@@ -372,8 +372,7 @@ sbl_return:
 		umem_free(req_ptr, sizeof (pcp_sbl_req_t));
 	if (resp_ptr != NULL)
 		free(resp_ptr);
-	if (nvlp != NULL)
-		nvlist_free(nvlp);
+	nvlist_free(nvlp);
 }
 
 static void
diff --git a/usr/src/cmd/rcm_daemon/common/aggr_rcm.c b/usr/src/cmd/rcm_daemon/common/aggr_rcm.c
index 61aaa2dffd..d2aa27d735 100644
--- a/usr/src/cmd/rcm_daemon/common/aggr_rcm.c
+++ b/usr/src/cmd/rcm_daemon/common/aggr_rcm.c
@@ -1319,8 +1319,7 @@ aggr_notify_new_aggr(rcm_handle_t *hd, char *rsrc)
 
 	ret = 0;
 done:
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	return (ret);
 }
 
diff --git a/usr/src/cmd/rcm_daemon/common/ibpart_rcm.c b/usr/src/cmd/rcm_daemon/common/ibpart_rcm.c
index 65d24b4180..6d47379ad5 100644
--- a/usr/src/cmd/rcm_daemon/common/ibpart_rcm.c
+++ b/usr/src/cmd/rcm_daemon/common/ibpart_rcm.c
@@ -1248,8 +1248,7 @@ ibpart_notify_new_ibpart(rcm_handle_t *hd, char *rsrc)
 
 	ret = 0;
 done:
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	return (ret);
 }
 
diff --git a/usr/src/cmd/rcm_daemon/common/vlan_rcm.c b/usr/src/cmd/rcm_daemon/common/vlan_rcm.c
index 83a5ea7982..61ab2ba5e4 100644
--- a/usr/src/cmd/rcm_daemon/common/vlan_rcm.c
+++ b/usr/src/cmd/rcm_daemon/common/vlan_rcm.c
@@ -1216,8 +1216,7 @@ vlan_notify_new_vlan(rcm_handle_t *hd, char *rsrc)
 
 	ret = 0;
 done:
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	return (ret);
 }
 
diff --git a/usr/src/cmd/rcm_daemon/common/vnic_rcm.c b/usr/src/cmd/rcm_daemon/common/vnic_rcm.c
index 18bd4118a9..13516d9627 100644
--- a/usr/src/cmd/rcm_daemon/common/vnic_rcm.c
+++ b/usr/src/cmd/rcm_daemon/common/vnic_rcm.c
@@ -1227,8 +1227,7 @@ vnic_notify_new_vnic(rcm_handle_t *hd, char *rsrc)
 
 	ret = 0;
 done:
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	return (ret);
 }
 
diff --git a/usr/src/cmd/syseventd/modules/sysevent_conf_mod/sysevent_conf_mod.c b/usr/src/cmd/syseventd/modules/sysevent_conf_mod/sysevent_conf_mod.c
index 65e43c1bc1..3aee5c6c51 100644
--- a/usr/src/cmd/syseventd/modules/sysevent_conf_mod/sysevent_conf_mod.c
+++ b/usr/src/cmd/syseventd/modules/sysevent_conf_mod/sysevent_conf_mod.c
@@ -1696,12 +1696,10 @@ queue_event(sysevent_t *ev, syseventtab_t *sep, sysevent_hdr_info_t *hdr)
 		}
 		if (expand_macros(ev, nvlist, sep, line, hdr)) {
 			freestr(line);
-			if (nvlist)
-				nvlist_free(nvlist);
+			nvlist_free(nvlist);
 			return (1);
 		}
-		if (nvlist)
-			nvlist_free(nvlist);
+		nvlist_free(nvlist);
 	}
 
 	if (debug_level >= DBG_EXEC) {
diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c
index d0627c94b5..db46fbc72b 100644
--- a/usr/src/cmd/zfs/zfs_main.c
+++ b/usr/src/cmd/zfs/zfs_main.c
@@ -5347,8 +5347,7 @@ zfs_do_allow_unallow_impl(int argc, char **argv, boolean_t un)
 
 cleanup0:
 	nvlist_free(perm_nvl);
-	if (update_perm_nvl != NULL)
-		nvlist_free(update_perm_nvl);
+	nvlist_free(update_perm_nvl);
 cleanup1:
 	fs_perm_set_fini(&fs_perm_set);
 cleanup2:
diff --git a/usr/src/cmd/zoneadm/zfs.c b/usr/src/cmd/zoneadm/zfs.c
index d27b9c4678..a279cd6823 100644
--- a/usr/src/cmd/zoneadm/zfs.c
+++ b/usr/src/cmd/zoneadm/zfs.c
@@ -381,8 +381,7 @@ clone_snap(char *snapshot_name, char *zonepath)
 	    "off") != 0) ||
 	    (nvlist_add_string(props, zfs_prop_to_name(ZFS_PROP_SHARESMB),
 	    "off") != 0)) {
-		if (props != NULL)
-			nvlist_free(props);
+		nvlist_free(props);
 		(void) fprintf(stderr, gettext("could not create ZFS clone "
 		    "%s: out of memory\n"), zonepath);
 		return (Z_ERR);
@@ -988,8 +987,7 @@ create_zfs_zonepath(char *zonepath)
 	    "off") != 0) ||
 	    (nvlist_add_string(props, zfs_prop_to_name(ZFS_PROP_SHARESMB),
 	    "off") != 0)) {
-		if (props != NULL)
-			nvlist_free(props);
+		nvlist_free(props);
 		(void) fprintf(stderr, gettext("cannot create ZFS dataset %s: "
 		    "out of memory\n"), zfs_name);
 	}
diff --git a/usr/src/cmd/zoneadmd/vplat.c b/usr/src/cmd/zoneadmd/vplat.c
index 437385ee09..9d32485fad 100644
--- a/usr/src/cmd/zoneadmd/vplat.c
+++ b/usr/src/cmd/zoneadmd/vplat.c
@@ -3480,8 +3480,7 @@ out:
 	zonecfg_free_rctl_value_list(rctltab.zone_rctl_valptr);
 	if (error && nvl_packed != NULL)
 		free(nvl_packed);
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	if (nvlv != NULL)
 		free(nvlv);
 	if (handle != NULL)
diff --git a/usr/src/cmd/zpool/zpool_main.c b/usr/src/cmd/zpool/zpool_main.c
index a2af33be8c..cef01c1b0b 100644
--- a/usr/src/cmd/zpool/zpool_main.c
+++ b/usr/src/cmd/zpool/zpool_main.c
@@ -3241,8 +3241,7 @@ zpool_do_split(int argc, char **argv)
 			if (add_prop_list(
 			    zpool_prop_to_name(ZPOOL_PROP_ALTROOT), optarg,
 			    &props, B_TRUE) != 0) {
-				if (props)
-					nvlist_free(props);
+				nvlist_free(props);
 				usage(B_FALSE);
 			}
 			break;
@@ -3255,8 +3254,7 @@ zpool_do_split(int argc, char **argv)
 				propval++;
 				if (add_prop_list(optarg, propval,
 				    &props, B_TRUE) != 0) {
-					if (props)
-						nvlist_free(props);
+					nvlist_free(props);
 					usage(B_FALSE);
 				}
 			} else {
diff --git a/usr/src/cmd/zpool/zpool_vdev.c b/usr/src/cmd/zpool/zpool_vdev.c
index 7b65e80723..cd496d0f26 100644
--- a/usr/src/cmd/zpool/zpool_vdev.c
+++ b/usr/src/cmd/zpool/zpool_vdev.c
@@ -1403,8 +1403,7 @@ split_mirror_vdev(zpool_handle_t *zhp, char *newname, nvlist_t *props,
 	}
 
 	if (zpool_vdev_split(zhp, newname, &newroot, props, flags) != 0) {
-		if (newroot != NULL)
-			nvlist_free(newroot);
+		nvlist_free(newroot);
 		return (NULL);
 	}
 
diff --git a/usr/src/common/fsreparse/fs_reparse.c b/usr/src/common/fsreparse/fs_reparse.c
index 82da0349fd..787706af35 100644
--- a/usr/src/common/fsreparse/fs_reparse.c
+++ b/usr/src/common/fsreparse/fs_reparse.c
@@ -80,8 +80,7 @@ reparse_init(void)
 void
 reparse_free(nvlist_t *nvl)
 {
-	if (nvl)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 }
 
 /*
diff --git a/usr/src/common/nvpair/nvpair.c b/usr/src/common/nvpair/nvpair.c
index 4c26d46dd1..691de5d61b 100644
--- a/usr/src/common/nvpair/nvpair.c
+++ b/usr/src/common/nvpair/nvpair.c
@@ -540,8 +540,7 @@ nvpair_free(nvpair_t *nvp)
 		int i;
 
 		for (i = 0; i < NVP_NELEM(nvp); i++)
-			if (nvlp[i] != NULL)
-				nvlist_free(nvlp[i]);
+			nvlist_free(nvlp[i]);
 		break;
 	}
 	default:
diff --git a/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c b/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c
index b5689ccf35..6186f187e0 100644
--- a/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c
+++ b/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c
@@ -1970,8 +1970,7 @@ cfga_list_ext(const char *ap_id, cfga_list_data_t **ap_id_list, int *nlistp,
 	}
 
 	S_FREE(snap_data);
-	if (nvl)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	/*
 	 * if a cmdline specified ap_id doesn't match the known list of ap_ids
diff --git a/usr/src/lib/cfgadm_plugins/sbd/common/ap_rcm.c b/usr/src/lib/cfgadm_plugins/sbd/common/ap_rcm.c
index 770784f16f..63afa50627 100644
--- a/usr/src/lib/cfgadm_plugins/sbd/common/ap_rcm.c
+++ b/usr/src/lib/cfgadm_plugins/sbd/common/ap_rcm.c
@@ -797,8 +797,7 @@ ap_rcm_cap_cpu(apd_t *a, rcmd_t *rcm, rcm_handle_t *hd, uint_t flags,
 	}
 
 done:
-	if (nvl)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	s_free(oldcpuids);
 	s_free(newcpuids);
 	return (rv);
diff --git a/usr/src/lib/fm/libfmd_agent/common/fmd_agent.c b/usr/src/lib/fm/libfmd_agent/common/fmd_agent.c
index d3ac298a1c..928978fa17 100644
--- a/usr/src/lib/fm/libfmd_agent/common/fmd_agent.c
+++ b/usr/src/lib/fm/libfmd_agent/common/fmd_agent.c
@@ -74,10 +74,8 @@ static int
 cleanup_set_errno(fmd_agent_hdl_t *hdl, nvlist_t *innvl, nvlist_t *outnvl,
     int err)
 {
-	if (innvl != NULL)
-		nvlist_free(innvl);
-	if (outnvl != NULL)
-		nvlist_free(outnvl);
+	nvlist_free(innvl);
+	nvlist_free(outnvl);
 	return (fmd_agent_seterrno(hdl, err));
 }
 
diff --git a/usr/src/lib/fm/libfmd_agent/i386/fmd_agent_i386.c b/usr/src/lib/fm/libfmd_agent/i386/fmd_agent_i386.c
index cc25fccb5e..0c537352a0 100644
--- a/usr/src/lib/fm/libfmd_agent/i386/fmd_agent_i386.c
+++ b/usr/src/lib/fm/libfmd_agent/i386/fmd_agent_i386.c
@@ -36,10 +36,8 @@ static int
 cleanup_set_errno(fmd_agent_hdl_t *hdl, nvlist_t *innvl, nvlist_t *outnvl,
     int err)
 {
-	if (innvl != NULL)
-		nvlist_free(innvl);
-	if (outnvl != NULL)
-		nvlist_free(outnvl);
+	nvlist_free(innvl);
+	nvlist_free(outnvl);
 	return (fmd_agent_seterrno(hdl, err));
 }
 
diff --git a/usr/src/lib/fm/libfmevent/common/fmev_publish.c b/usr/src/lib/fm/libfmevent/common/fmev_publish.c
index f3dc01ed11..6b9f464550 100644
--- a/usr/src/lib/fm/libfmevent/common/fmev_publish.c
+++ b/usr/src/lib/fm/libfmevent/common/fmev_publish.c
@@ -434,11 +434,10 @@ do_publish(const char *file, const char *func, int64_t line,
 
 done:
 	/* Free a passed in nvlist iff success */
-	if (nvl && rc == FMEV_SUCCESS)
+	if (rc == FMEV_SUCCESS)
 		nvlist_free(nvl);
 
-	if (tmpnvl)
-		nvlist_free(tmpnvl);
+	nvlist_free(tmpnvl);
 
 	return (rc);
 }
diff --git a/usr/src/lib/fm/topo/libtopo/common/hc.c b/usr/src/lib/fm/topo/libtopo/common/hc.c
index 352c34c2f6..59b9866285 100644
--- a/usr/src/lib/fm/topo/libtopo/common/hc.c
+++ b/usr/src/lib/fm/topo/libtopo/common/hc.c
@@ -1036,8 +1036,7 @@ hc_fmri_str2nvl(topo_mod_t *mod, tnode_t *node, topo_version_t version,
 	return (0);
 
 hcfmbail:
-	if (nf != NULL)
-		nvlist_free(nf);
+	nvlist_free(nf);
 	for (i = 0; i < npairs; i++)
 		nvlist_free(pa[i]);
 	topo_mod_free(mod, pa, npairs * sizeof (nvlist_t *));
@@ -1177,8 +1176,7 @@ hc_fmri_create(topo_mod_t *mod, nvlist_t *pfmri, int version, const char *name,
 
 	if (hcl != NULL) {
 		for (i = 0; i < pelems + 1; ++i) {
-			if (hcl[i] != NULL)
-				nvlist_free(hcl[i]);
+			nvlist_free(hcl[i]);
 		}
 		topo_mod_free(mod, hcl, sizeof (nvlist_t *) * (pelems + 1));
 	}
diff --git a/usr/src/lib/fm/topo/libtopo/common/sw.c b/usr/src/lib/fm/topo/libtopo/common/sw.c
index c655627f52..ef221565af 100644
--- a/usr/src/lib/fm/topo/libtopo/common/sw.c
+++ b/usr/src/lib/fm/topo/libtopo/common/sw.c
@@ -281,18 +281,12 @@ context:
 out:
 	if (moderr == 0)
 		*out = fmri;
-
-	if (moderr != 0 && fmri)
+	else
 		nvlist_free(fmri);
 
-	if (obj)
-		nvlist_free(obj);
-
-	if (site)
-		nvlist_free(site);
-
-	if (ctxt)
-		nvlist_free(ctxt);
+	nvlist_free(obj);
+	nvlist_free(site);
+	nvlist_free(ctxt);
 
 	return (moderr == 0 ? 0 : topo_mod_seterrno(mod, moderr));
 }
diff --git a/usr/src/lib/fm/topo/libtopo/common/topo_fmri.c b/usr/src/lib/fm/topo/libtopo/common/topo_fmri.c
index 33516d348f..c712cac908 100644
--- a/usr/src/lib/fm/topo/libtopo/common/topo_fmri.c
+++ b/usr/src/lib/fm/topo/libtopo/common/topo_fmri.c
@@ -74,8 +74,7 @@
 static int
 set_error(topo_hdl_t *thp, int err, int *errp, char *method, nvlist_t *nvlp)
 {
-	if (nvlp != NULL)
-		nvlist_free(nvlp);
+	nvlist_free(nvlp);
 
 	topo_dprintf(thp, TOPO_DBG_ERR, "%s failed: %s\n", method,
 	    topo_strerror(err));
@@ -88,8 +87,7 @@ set_error(topo_hdl_t *thp, int err, int *errp, char *method, nvlist_t *nvlp)
 static nvlist_t *
 set_nverror(topo_hdl_t *thp, int err, int *errp, char *method, nvlist_t *nvlp)
 {
-	if (nvlp != NULL)
-		nvlist_free(nvlp);
+	nvlist_free(nvlp);
 
 	topo_dprintf(thp, TOPO_DBG_ERR, "%s failed: %s\n", method,
 	    topo_strerror(err));
@@ -593,8 +591,7 @@ int topo_fmri_setprop(topo_hdl_t *thp, nvlist_t *nvl, const char *pg,
 	nvlist_free(in);
 
 	/* no return values */
-	if (out != NULL)
-		nvlist_free(out);
+	nvlist_free(out);
 
 	if (rv)
 		return (-1);
diff --git a/usr/src/lib/fm/topo/libtopo/common/topo_parse.c b/usr/src/lib/fm/topo/libtopo/common/topo_parse.c
index 84658982d9..da10e0df55 100644
--- a/usr/src/lib/fm/topo/libtopo/common/topo_parse.c
+++ b/usr/src/lib/fm/topo/libtopo/common/topo_parse.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <libxml/parser.h>
 #include <fm/libtopo.h>
 #include <topo_alloc.h>
@@ -195,8 +193,7 @@ tf_pad_free(topo_mod_t *mp, tf_pad_t *p)
 		return;
 	if (p->tpad_pgs != NULL) {
 		for (n = 0; n < p->tpad_pgcnt; n++)
-			if (p->tpad_pgs[n] != NULL)
-				nvlist_free(p->tpad_pgs[n]);
+			nvlist_free(p->tpad_pgs[n]);
 		topo_mod_free(mp,
 		    p->tpad_pgs, p->tpad_pgcnt * sizeof (nvlist_t *));
 	}
diff --git a/usr/src/lib/fm/topo/libtopo/common/topo_prop.c b/usr/src/lib/fm/topo/libtopo/common/topo_prop.c
index 411475aae8..63ff31279a 100644
--- a/usr/src/lib/fm/topo/libtopo/common/topo_prop.c
+++ b/usr/src/lib/fm/topo/libtopo/common/topo_prop.c
@@ -109,8 +109,7 @@ propval_get(topo_pgroup_t *pg, const char *pname)
 static int
 method_geterror(nvlist_t *nvl, int err, int *errp)
 {
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	*errp = err;
 
@@ -165,8 +164,7 @@ prop_method_get(tnode_t *node, topo_propval_t *pv, topo_propmethod_t *pm,
 		return (method_geterror(nvl, ETOPO_PROP_TYPE, err));
 
 	/* Release the last value and re-assign to the new value */
-	if (pv->tp_val != NULL)
-		nvlist_free(pv->tp_val);
+	nvlist_free(pv->tp_val);
 	pv->tp_val = nvl;
 
 	return (0);
@@ -855,8 +853,7 @@ register_methoderror(tnode_t *node, topo_propmethod_t *pm, int *errp, int l,
 	if (pm != NULL) {
 		if (pm->tpm_name != NULL)
 			topo_hdl_strfree(thp, pm->tpm_name);
-		if (pm->tpm_args != NULL)
-			nvlist_free(pm->tpm_args);
+		nvlist_free(pm->tpm_args);
 		topo_hdl_free(thp, pm, sizeof (topo_propmethod_t));
 	}
 
@@ -1307,8 +1304,7 @@ propmethod_destroy(topo_hdl_t *thp, topo_propval_t *pv)
 	if (pm != NULL) {
 		if (pm->tpm_name != NULL)
 			topo_hdl_strfree(thp, pm->tpm_name);
-		if (pm->tpm_args != NULL)
-			nvlist_free(pm->tpm_args);
+		nvlist_free(pm->tpm_args);
 		topo_hdl_free(thp, pm, sizeof (topo_propmethod_t));
 		pv->tp_method = NULL;
 	}
@@ -1327,8 +1323,7 @@ topo_propval_destroy(topo_propval_t *pv)
 	if (pv->tp_name != NULL)
 		topo_hdl_strfree(thp, pv->tp_name);
 
-	if (pv->tp_val != NULL)
-		nvlist_free(pv->tp_val);
+	nvlist_free(pv->tp_val);
 
 	propmethod_destroy(thp, pv);
 
@@ -1403,8 +1398,7 @@ get_pgrp_seterror(tnode_t *node, nvlist_t *nvl, int *errp, int err)
 {
 	topo_node_unlock(node);
 
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	*errp = err;
 
@@ -1476,8 +1470,7 @@ get_all_seterror(tnode_t *node, nvlist_t *nvl, int *errp, int err)
 {
 	topo_node_unlock(node);
 
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	*errp = err;
 
diff --git a/usr/src/lib/fm/topo/libtopo/common/topo_xml.c b/usr/src/lib/fm/topo/libtopo/common/topo_xml.c
index f26d5f6ef9..bbac0d17f1 100644
--- a/usr/src/lib/fm/topo/libtopo/common/topo_xml.c
+++ b/usr/src/lib/fm/topo/libtopo/common/topo_xml.c
@@ -1012,8 +1012,7 @@ pmr_done:
 		xmlFree(meth_name);
 	if (prop_name)
 		xmlFree(prop_name);
-	if (arg_nvl)
-		nvlist_free(arg_nvl);
+	nvlist_free(arg_nvl);
 	return (ret);
 }
 
@@ -1102,8 +1101,7 @@ pgroup_record(topo_mod_t *mp, xmlNodePtr pxn, tnode_t *tn, const char *rname,
 		e |= nvlist_add_nvlist_array(pgnvl, INV_PGRP_ALLPROPS, apl,
 		    pcnt);
 		for (ai = 0; ai < pcnt; ai++)
-			if (apl[ai] != NULL)
-				nvlist_free(apl[ai]);
+			nvlist_free(apl[ai]);
 		topo_mod_free(mp, apl, pcnt * sizeof (nvlist_t *));
 		if (e != 0) {
 			nvlist_free(pgnvl);
diff --git a/usr/src/lib/fm/topo/modules/SUNW,SPARC-Enterprise/ioboard/opl_hostbridge.c b/usr/src/lib/fm/topo/modules/SUNW,SPARC-Enterprise/ioboard/opl_hostbridge.c
index f929d65a90..bef0828f89 100644
--- a/usr/src/lib/fm/topo/modules/SUNW,SPARC-Enterprise/ioboard/opl_hostbridge.c
+++ b/usr/src/lib/fm/topo/modules/SUNW,SPARC-Enterprise/ioboard/opl_hostbridge.c
@@ -209,8 +209,7 @@ opl_rc_node_create(topo_mod_t *mp, tnode_t *parent, di_node_t dnode, int inst)
 	    TOPO_IO_MODULE, TOPO_PROP_IMMUTABLE, mod,  &err) != 0) {
 		topo_mod_dprintf(mp, "Failed to set MODULE property\n");
 	}
-	if (mod != NULL)
-		nvlist_free(mod);
+	nvlist_free(mod);
 
 	/* This is a PCIEX Root Complex */
 	if (topo_prop_set_string(rcn, TOPO_PGROUP_PCI, TOPO_PCI_EXCAP,
diff --git a/usr/src/lib/fm/topo/modules/common/disk/disk_common.c b/usr/src/lib/fm/topo/modules/common/disk/disk_common.c
index d55d6037fc..7d42f3ee60 100644
--- a/usr/src/lib/fm/topo/modules/common/disk/disk_common.c
+++ b/usr/src/lib/fm/topo/modules/common/disk/disk_common.c
@@ -266,12 +266,11 @@ disk_set_props(topo_mod_t *mod, tnode_t *parent,
 	}
 	err = 0;
 
-out:	if (fmri)
-		nvlist_free(fmri);
+out:
+	nvlist_free(fmri);
 	if (label)
 		topo_mod_strfree(mod, label);
-	if (asru)
-		nvlist_free(asru);
+	nvlist_free(asru);
 	return (err);
 
 error:	err = topo_mod_seterrno(mod, err);
diff --git a/usr/src/lib/fm/topo/modules/common/pcibus/did_props.c b/usr/src/lib/fm/topo/modules/common/pcibus/did_props.c
index 75008fd2fa..2fcc36e924 100644
--- a/usr/src/lib/fm/topo/modules/common/pcibus/did_props.c
+++ b/usr/src/lib/fm/topo/modules/common/pcibus/did_props.c
@@ -612,8 +612,7 @@ FRU_set(tnode_t *tn, did_t *pd,
 		}
 		nvlist_free(in);
 		(void) topo_node_fru_set(tn, out, 0, &err);
-		if (out != NULL)
-			nvlist_free(out);
+		nvlist_free(out);
 	} else
 		(void) topo_node_fru_set(tn, NULL, 0, &err);
 
diff --git a/usr/src/lib/fm/topo/modules/i86pc/chip/chip_amd.c b/usr/src/lib/fm/topo/modules/i86pc/chip/chip_amd.c
index 23052a2356..d9a8eca7b8 100644
--- a/usr/src/lib/fm/topo/modules/i86pc/chip/chip_amd.c
+++ b/usr/src/lib/fm/topo/modules/i86pc/chip/chip_amd.c
@@ -688,8 +688,7 @@ amd_dramchan_create(topo_mod_t *mod, tnode_t *pnode, const char *name,
 		(void) topo_prop_set_string(chnode, PGNAME(CHAN), "channel",
 		    TOPO_PROP_IMMUTABLE, i == 0 ? "A" : "B", &err);
 	}
-	if (pfmri)
-		nvlist_free(pfmri);
+	nvlist_free(pfmri);
 
 	return (nerr == 0 ? 0 : -1);
 }
diff --git a/usr/src/lib/fm/topo/modules/sun4v/cpuboard/cpuboard_hostbridge.c b/usr/src/lib/fm/topo/modules/sun4v/cpuboard/cpuboard_hostbridge.c
index 3ee979fcd0..15e685c1d4 100644
--- a/usr/src/lib/fm/topo/modules/sun4v/cpuboard/cpuboard_hostbridge.c
+++ b/usr/src/lib/fm/topo/modules/sun4v/cpuboard/cpuboard_hostbridge.c
@@ -184,8 +184,7 @@ cpuboard_rc_node_create(topo_mod_t *mp, tnode_t *parent, di_node_t dnode,
 	    TOPO_IO_MODULE, TOPO_PROP_IMMUTABLE, mod,  &err) != 0) {
 		topo_mod_dprintf(mp, "Failed to set MODULE property\n");
 	}
-	if (mod != NULL)
-		nvlist_free(mod);
+	nvlist_free(mod);
 
 	/* This is a PCIEX Root Complex */
 	if (topo_prop_set_string(rcn, TOPO_PGROUP_PCI, TOPO_PCI_EXCAP,
diff --git a/usr/src/lib/libbe/common/be_create.c b/usr/src/lib/libbe/common/be_create.c
index f6a343829b..d06c9b02da 100644
--- a/usr/src/lib/libbe/common/be_create.c
+++ b/usr/src/lib/libbe/common/be_create.c
@@ -352,8 +352,7 @@ be_init(nvlist_t *be_attrs)
 	}
 
 done:
-	if (bt.nbe_zfs_props != NULL)
-		nvlist_free(bt.nbe_zfs_props);
+	nvlist_free(bt.nbe_zfs_props);
 
 	be_zfs_fini();
 
@@ -1167,8 +1166,7 @@ done:
 	ZFS_CLOSE(zhp);
 	be_free_fs_list(&fld);
 
-	if (bt.nbe_zfs_props != NULL)
-		nvlist_free(bt.nbe_zfs_props);
+	nvlist_free(bt.nbe_zfs_props);
 
 	free(bt.obe_altroot);
 	free(new_mp);
@@ -2090,8 +2088,7 @@ be_copy_zones(char *obe_name, char *obe_root_ds, char *nbe_root_ds)
 				    "failed to create zone BE clone for new "
 				    "zone BE %s\n"), new_zone_be_name);
 				ret = iret;
-				if (bt.nbe_zfs_props != NULL)
-					nvlist_free(bt.nbe_zfs_props);
+				nvlist_free(bt.nbe_zfs_props);
 				goto done;
 			}
 			/*
@@ -2116,8 +2113,7 @@ be_copy_zones(char *obe_name, char *obe_root_ds, char *nbe_root_ds)
 					    "failed to generate auto name "
 					    "for zone BE.\n"));
 					ret = BE_ERR_AUTONAME;
-					if (bt.nbe_zfs_props != NULL)
-						nvlist_free(bt.nbe_zfs_props);
+					nvlist_free(bt.nbe_zfs_props);
 					goto done;
 				}
 
@@ -2140,8 +2136,7 @@ be_copy_zones(char *obe_name, char *obe_root_ds, char *nbe_root_ds)
 					    zoneroot_ds,
 					    libzfs_error_description(g_zfs));
 					ret = zfs_err_to_be_err(g_zfs);
-					if (bt.nbe_zfs_props != NULL)
-						nvlist_free(bt.nbe_zfs_props);
+					nvlist_free(bt.nbe_zfs_props);
 					goto done;
 				}
 
@@ -2161,8 +2156,7 @@ be_copy_zones(char *obe_name, char *obe_root_ds, char *nbe_root_ds)
 					    "for new zone BE %s\n"),
 					    new_zone_be_name);
 					ret = iret;
-					if (bt.nbe_zfs_props != NULL)
-						nvlist_free(bt.nbe_zfs_props);
+					nvlist_free(bt.nbe_zfs_props);
 					goto done;
 				}
 			}
@@ -2177,14 +2171,12 @@ be_copy_zones(char *obe_name, char *obe_root_ds, char *nbe_root_ds)
 				free(bt.nbe_name);
 				bt.nbe_name = NULL;
 				ret = BE_ERR_AUTONAME;
-				if (bt.nbe_zfs_props != NULL)
-					nvlist_free(bt.nbe_zfs_props);
+				nvlist_free(bt.nbe_zfs_props);
 				goto done;
 			}
 		}
 
-		if (bt.nbe_zfs_props != NULL)
-			nvlist_free(bt.nbe_zfs_props);
+		nvlist_free(bt.nbe_zfs_props);
 
 		z_zhp = NULL;
 
diff --git a/usr/src/lib/libbe/common/be_snapshot.c b/usr/src/lib/libbe/common/be_snapshot.c
index d63528d05e..a4e2c79e5a 100644
--- a/usr/src/lib/libbe/common/be_snapshot.c
+++ b/usr/src/lib/libbe/common/be_snapshot.c
@@ -606,8 +606,7 @@ _be_create_snapshot(char *be_name, char **snap_name, char *policy)
 done:
 	ZFS_CLOSE(zhp);
 
-	if (ss_props != NULL)
-		nvlist_free(ss_props);
+	nvlist_free(ss_props);
 
 	return (ret);
 }
diff --git a/usr/src/lib/libcmdutils/common/process_xattrs.c b/usr/src/lib/libcmdutils/common/process_xattrs.c
index 1264d467bd..50b1de58d6 100644
--- a/usr/src/lib/libcmdutils/common/process_xattrs.c
+++ b/usr/src/lib/libcmdutils/common/process_xattrs.c
@@ -218,8 +218,7 @@ mv_xattrs(char *cmd, char *infile, char *outfile, int sattr, int silent)
 			    "failed to move system attribute");
 	}
 error:
-	if (res != NULL)
-		nvlist_free(res);
+	nvlist_free(res);
 	if (silent == 0 && etext != NULL) {
 		if (!sattr)
 			(void) fprintf(stderr, dgettext(TEXT_DOMAIN,
@@ -246,8 +245,7 @@ done:
 		(void) close(indfd);
 	if (outdfd != -1)
 		(void) close(outdfd);
-	if (response != NULL)
-		nvlist_free(response);
+	nvlist_free(response);
 	if (etext != NULL)
 		return (1);
 	else
@@ -319,7 +317,6 @@ sysattr_list(char *cmd, int fd, char *fname)
 				return (response);
 		}
 	}
-	if (response != NULL)
-		nvlist_free(response);
+	nvlist_free(response);
 	return (NULL);
 }
diff --git a/usr/src/lib/libcontract/common/libcontract.c b/usr/src/lib/libcontract/common/libcontract.c
index 2c8afda094..3a3bf4a76a 100644
--- a/usr/src/lib/libcontract/common/libcontract.c
+++ b/usr/src/lib/libcontract/common/libcontract.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/ctfs.h>
 #include <sys/contract.h>
 #include <string.h>
@@ -467,8 +465,7 @@ errout:
 	if (event_buffer)
 		free(event_buffer);
 	if (info) {
-		if (info->nvl)
-			nvlist_free(info->nvl);
+		nvlist_free(info->nvl);
 		free(info);
 	}
 	return (error);
@@ -507,8 +504,7 @@ ct_event_free(ct_evthdl_t evthdl)
 {
 	struct ctlib_event_info *info = evthdl;
 
-	if (info->nvl)
-		nvlist_free(info->nvl);
+	nvlist_free(info->nvl);
 	free(info);
 }
 
diff --git a/usr/src/lib/libdiskmgt/common/entry.c b/usr/src/lib/libdiskmgt/common/entry.c
index 6acf22f82a..94b36a55be 100644
--- a/usr/src/lib/libdiskmgt/common/entry.c
+++ b/usr/src/lib/libdiskmgt/common/entry.c
@@ -716,10 +716,8 @@ dm_isoverlapping(char *slicename, char **overlaps_with, int *errp)
 	}
 
 out:
-	if (media_attrs)
-		nvlist_free(media_attrs);
-	if (slice_attrs)
-		nvlist_free(slice_attrs);
+	nvlist_free(media_attrs);
+	nvlist_free(slice_attrs);
 
 	if (slices)
 		dm_free_descriptors(slices);
@@ -1057,8 +1055,7 @@ dm_inuse(char *dev_name, char **msg, dm_who_type_t who, int *errp)
 out:
 	if (dname != NULL)
 		free(dname);
-	if (dev_stats != NULL)
-		nvlist_free(dev_stats);
+	nvlist_free(dev_stats);
 
 	return (found);
 }
diff --git a/usr/src/lib/libdladm/common/libdllink.c b/usr/src/lib/libdladm/common/libdllink.c
index 8a3c5759ee..58bec0ad30 100644
--- a/usr/src/lib/libdladm/common/libdllink.c
+++ b/usr/src/lib/libdladm/common/libdllink.c
@@ -580,8 +580,7 @@ i_dladm_rename_link_c2(dladm_handle_t handle, datalink_id_t linkid1,
 done:
 	if (rcm_hdl != NULL)
 		(void) rcm_free_handle(rcm_hdl);
-	if (nvl != NULL)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	return (status);
 }
 
diff --git a/usr/src/lib/libipp/libipp.c b/usr/src/lib/libipp/libipp.c
index 94a5dc3a45..0b931a10e8 100644
--- a/usr/src/lib/libipp/libipp.c
+++ b/usr/src/lib/libipp/libipp.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -225,8 +223,7 @@ ipp_action_destroy(
 
 	return (dispatch(&nvlp, NULL, NULL));
 failed:
-	if (nvlp != NULL)
-		nvlist_free(nvlp);
+	nvlist_free(nvlp);
 	errno = rc;
 	return (-1);
 }
@@ -336,8 +333,7 @@ ipp_action_info(
 
 	return (dispatch(&nvlp, fn, arg));
 failed:
-	if (nvlp != NULL)
-		nvlist_free(nvlp);
+	nvlist_free(nvlp);
 	errno = rc;
 	return (-1);
 }
@@ -389,8 +385,7 @@ ipp_action_mod(
 
 	return (dispatch(&nvlp, string_callback, (void *)modnamep));
 failed:
-	if (nvlp != NULL)
-		nvlist_free(nvlp);
+	nvlist_free(nvlp);
 	errno = rc;
 	return (-1);
 }
@@ -446,8 +441,7 @@ ipp_list_mods(
 
 	return (rc);
 failed:
-	if (nvlp != NULL)
-		nvlist_free(nvlp);
+	nvlist_free(nvlp);
 	errno = rc;
 	return (-1);
 }
@@ -510,8 +504,7 @@ ipp_mod_list_actions(
 
 	return (rc);
 failed:
-	if (nvlp != NULL)
-		nvlist_free(nvlp);
+	nvlist_free(nvlp);
 	errno = rc;
 	return (-1);
 }
diff --git a/usr/src/lib/libnwam/common/libnwam_values.c b/usr/src/lib/libnwam/common/libnwam_values.c
index 6c9d08a3ce..8bf78f62b9 100644
--- a/usr/src/lib/libnwam/common/libnwam_values.c
+++ b/usr/src/lib/libnwam/common/libnwam_values.c
@@ -380,8 +380,7 @@ nwam_alloc_object_list(void *list)
 void
 nwam_free_object_list(void *list)
 {
-	if (list != NULL)
-		nvlist_free(list);
+	nvlist_free(list);
 }
 
 nwam_error_t
diff --git a/usr/src/lib/libpool/common/pool_kernel.c b/usr/src/lib/libpool/common/pool_kernel.c
index 2e1375e499..2179a7f0ea 100644
--- a/usr/src/lib/libpool/common/pool_kernel.c
+++ b/usr/src/lib/libpool/common/pool_kernel.c
@@ -2415,8 +2415,7 @@ pool_knl_put_property(pool_elem_t *pe, const char *name,
 		return (PO_FAIL);
 
 	if (prov->pkc_log->l_state != LS_DO) {
-		if (bl)
-			nvlist_free(bl);
+		nvlist_free(bl);
 		return (PO_SUCCESS);
 	}
 	/*
@@ -3460,8 +3459,7 @@ log_item_release(log_item_t *li)
 	case POOL_PROPPUT:
 		propput = (pool_propput_undo_t *)li->li_details;
 
-		if (propput->ppu_blist)
-			nvlist_free(propput->ppu_blist);
+		nvlist_free(propput->ppu_blist);
 		free(propput->ppu_ioctl.pp_o_buf);
 		free(propput);
 		break;
diff --git a/usr/src/lib/librcm/librcm.c b/usr/src/lib/librcm/librcm.c
index 88ca8b29c6..d3f7666495 100644
--- a/usr/src/lib/librcm/librcm.c
+++ b/usr/src/lib/librcm/librcm.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "librcm_impl.h"
 #include "librcm_event.h"
 
@@ -545,8 +543,7 @@ rcm_free_info(rcm_info_t *info)
 	while (info) {
 		rcm_info_t *tmp = info->next;
 
-		if (info->info)
-			nvlist_free(info->info);
+		nvlist_free(info->info);
 		free(info);
 
 		info = tmp;
@@ -1260,8 +1257,7 @@ retry:
 out:
 	if (nvl_packed)
 		free(nvl_packed);
-	if (ret)
-		nvlist_free(ret);
+	nvlist_free(ret);
 	dprintf((stderr, "daemon call is done. error = %d, errno = %s\n", error,
 	    strerror(errno)));
 	return (error);
@@ -1450,8 +1446,7 @@ rcm_generate_nvlist(int cmd, rcm_handle_t *hd, char **rsrcnames, uint_t flag,
 fail:
 	if (buf)
 		free(buf);
-	if (nvl)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	if (*nvl_packed)
 		free(*nvl_packed);
 	*nvl_packed = NULL;
diff --git a/usr/src/lib/libscf/common/notify_params.c b/usr/src/lib/libscf/common/notify_params.c
index 3e41d19f8f..963916514d 100644
--- a/usr/src/lib/libscf/common/notify_params.c
+++ b/usr/src/lib/libscf/common/notify_params.c
@@ -1770,8 +1770,7 @@ _scf_get_fma_notify_params(const char *class, nvlist_t *nvl, int getsource)
 	r = SCF_SUCCESS;
 
 cleanup:
-	if (params)
-		nvlist_free(params);
+	nvlist_free(params);
 	scf_pg_destroy(pg);
 	scf_instance_destroy(i);
 	scf_handle_destroy(h);
diff --git a/usr/src/lib/libsysevent/libsysevent.c b/usr/src/lib/libsysevent/libsysevent.c
index 28fdc6ca50..72ec9b008b 100644
--- a/usr/src/lib/libsysevent/libsysevent.c
+++ b/usr/src/lib/libsysevent/libsysevent.c
@@ -218,8 +218,7 @@ sysevent_free(sysevent_t *ev)
 {
 	nvlist_t *attr_list = (nvlist_t *)(uintptr_t)SE_ATTR_PTR(ev);
 
-	if (attr_list)
-		nvlist_free(attr_list);
+	nvlist_free(attr_list);
 	free(ev);
 }
 
@@ -1462,8 +1461,7 @@ create_cached_registration(sysevent_handle_t *shp,
 create_failed:
 	dealloc_subscribers(shp);
 	free_cached_registration(shp);
-	if (nvl)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	return (-1);
 
 }
diff --git a/usr/src/lib/libzfs/common/libzfs_config.c b/usr/src/lib/libzfs/common/libzfs_config.c
index fe380a24a2..b33d86432d 100644
--- a/usr/src/lib/libzfs/common/libzfs_config.c
+++ b/usr/src/lib/libzfs/common/libzfs_config.c
@@ -319,8 +319,7 @@ zpool_refresh_stats(zpool_handle_t *zhp, boolean_t *missing)
 		verify(nvlist_lookup_uint64(config,
 		    ZPOOL_CONFIG_POOL_TXG, &newtxg) == 0);
 
-		if (zhp->zpool_old_config != NULL)
-			nvlist_free(zhp->zpool_old_config);
+		nvlist_free(zhp->zpool_old_config);
 
 		if (oldtxg != newtxg) {
 			nvlist_free(zhp->zpool_config);
diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c
index 9fa99749ce..71a2226fef 100644
--- a/usr/src/lib/libzfs/common/libzfs_dataset.c
+++ b/usr/src/lib/libzfs/common/libzfs_dataset.c
@@ -2010,8 +2010,7 @@ get_numeric_property(zfs_handle_t *zhp, zfs_prop_t prop, zprop_source_t *src,
 			zcmd_free_nvlists(&zc);
 			return (-1);
 		}
-		if (zplprops)
-			nvlist_free(zplprops);
+		nvlist_free(zplprops);
 		zcmd_free_nvlists(&zc);
 		break;
 
@@ -4251,8 +4250,7 @@ zfs_smb_acl_mgmt(libzfs_handle_t *hdl, char *dataset, char *path,
 		return (-1);
 	}
 	error = ioctl(hdl->libzfs_fd, ZFS_IOC_SMB_ACL, &zc);
-	if (nvlist)
-		nvlist_free(nvlist);
+	nvlist_free(nvlist);
 	return (error);
 }
 
diff --git a/usr/src/lib/libzfs/common/libzfs_import.c b/usr/src/lib/libzfs/common/libzfs_import.c
index 011861f548..032cd11c8c 100644
--- a/usr/src/lib/libzfs/common/libzfs_import.c
+++ b/usr/src/lib/libzfs/common/libzfs_import.c
@@ -1282,8 +1282,7 @@ error:
 			venext = ve->ve_next;
 			for (ce = ve->ve_configs; ce != NULL; ce = cenext) {
 				cenext = ce->ce_next;
-				if (ce->ce_config)
-					nvlist_free(ce->ce_config);
+				nvlist_free(ce->ce_config);
 				free(ce);
 			}
 			free(ve);
diff --git a/usr/src/lib/libzfs/common/libzfs_pool.c b/usr/src/lib/libzfs/common/libzfs_pool.c
index 3c99295179..1f3ab8c3e9 100644
--- a/usr/src/lib/libzfs/common/libzfs_pool.c
+++ b/usr/src/lib/libzfs/common/libzfs_pool.c
@@ -1025,12 +1025,9 @@ zpool_open(libzfs_handle_t *hdl, const char *pool)
 void
 zpool_close(zpool_handle_t *zhp)
 {
-	if (zhp->zpool_config)
-		nvlist_free(zhp->zpool_config);
-	if (zhp->zpool_old_config)
-		nvlist_free(zhp->zpool_old_config);
-	if (zhp->zpool_props)
-		nvlist_free(zhp->zpool_props);
+	nvlist_free(zhp->zpool_config);
+	nvlist_free(zhp->zpool_old_config);
+	nvlist_free(zhp->zpool_props);
 	free(zhp);
 }
 
@@ -1548,8 +1545,7 @@ zpool_import(libzfs_handle_t *hdl, nvlist_t *config, const char *newname,
 
 	ret = zpool_import_props(hdl, config, newname, props,
 	    ZFS_IMPORT_NORMAL);
-	if (props)
-		nvlist_free(props);
+	nvlist_free(props);
 	return (ret);
 }
 
@@ -2854,8 +2850,7 @@ zpool_vdev_split(zpool_handle_t *zhp, char *newname, nvlist_t **newroot,
 	    &children) != 0) {
 		zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
 		    "Source pool is missing vdev tree"));
-		if (zc_props)
-			nvlist_free(zc_props);
+		nvlist_free(zc_props);
 		return (-1);
 	}
 
@@ -3003,10 +2998,8 @@ out:
 		free(varray);
 	}
 	zcmd_free_nvlists(&zc);
-	if (zc_props)
-		nvlist_free(zc_props);
-	if (newconfig)
-		nvlist_free(newconfig);
+	nvlist_free(zc_props);
+	nvlist_free(newconfig);
 	if (freelist) {
 		nvlist_free(*newroot);
 		*newroot = NULL;
diff --git a/usr/src/lib/libzfs/common/libzfs_sendrecv.c b/usr/src/lib/libzfs/common/libzfs_sendrecv.c
index ef659ff000..456ad3b858 100644
--- a/usr/src/lib/libzfs/common/libzfs_sendrecv.c
+++ b/usr/src/lib/libzfs/common/libzfs_sendrecv.c
@@ -2753,8 +2753,7 @@ zfs_receive_package(libzfs_handle_t *hdl, int fd, const char *destname,
 
 out:
 	fsavl_destroy(stream_avl);
-	if (stream_nv)
-		nvlist_free(stream_nv);
+	nvlist_free(stream_nv);
 	if (softerr)
 		error = -2;
 	if (anyerr)
diff --git a/usr/src/lib/pylibbe/common/libbe_py.c b/usr/src/lib/pylibbe/common/libbe_py.c
index bd9b3187ed..9cc1a7ac81 100644
--- a/usr/src/lib/pylibbe/common/libbe_py.c
+++ b/usr/src/lib/pylibbe/common/libbe_py.c
@@ -222,7 +222,7 @@ beCopy(PyObject *self, PyObject *args)
 		    NULL, NULL));
 	}
 
-	if (beProps != NULL) nvlist_free(beProps);
+	nvlist_free(beProps);
 
 	if (trgtBeName == NULL) {
 		/*
diff --git a/usr/src/man/man3nvpair/nvlist_alloc.3nvpair b/usr/src/man/man3nvpair/nvlist_alloc.3nvpair
index 28379ed74b..728bc34c5e 100644
--- a/usr/src/man/man3nvpair/nvlist_alloc.3nvpair
+++ b/usr/src/man/man3nvpair/nvlist_alloc.3nvpair
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH NVLIST_ALLOC 3NVPAIR "Feb 2, 2004"
+.TH NVLIST_ALLOC 3NVPAIR "Feb 15, 2016"
 .SH NAME
 nvlist_alloc, nvlist_free, nvlist_size, nvlist_pack, nvlist_unpack, nvlist_dup,
 nvlist_merge, nvlist_xalloc, nvlist_xpack, nvlist_xunpack, nvlist_xdup,
@@ -96,7 +96,6 @@ a name-value pair list
 .fi
 
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fInvlp\fR\fR
@@ -226,7 +225,6 @@ A pointer to an \fBnv_alloc_t\fR structure to be used for the specified
 
 .SH DESCRIPTION
 .SS "List Manipulation"
-.sp
 .LP
 The \fBnvlist_alloc()\fR function allocates a new name-value pair list and
 updates \fInvlp\fR to point to the handle. The \fInvflag\fR argument specifies
@@ -243,7 +241,8 @@ that \fBnvlist_xalloc()\fR can use a different allocator, as described in the
 Pluggable Allocators section.
 .sp
 .LP
-The \fBnvlist_free()\fR function frees a name-value pair list.
+The \fBnvlist_free()\fR function frees a name-value pair list. If \fInvl\fR
+is a null pointer, no action occurs.
 .sp
 .LP
 The \fBnvlist_size()\fR function returns the minimum size of a contiguous
@@ -322,7 +321,6 @@ The \fBnvlist_lookup_nv_alloc()\fR function retrieves the pointer to the
 allocator that was used when manipulating a name-value pair list.
 .SS "Pluggable Allocators"
 .SS "Using Pluggable Allocators"
-.sp
 .LP
 The \fBnv_alloc_init()\fR, \fBnv_alloc_reset()\fR and \fBnv_alloc_fini()\fR
 functions provide an interface to specify the allocator to be used when
@@ -367,7 +365,6 @@ kernel use and is described on \fBnvlist_alloc\fR(9F).
 An example program that uses the pluggable allocator functionality is provided
 on \fBnvlist_alloc\fR(9F).
 .SS "Creating Pluggable Allocators"
-.sp
 .LP
 Any producer of name-value pairs can specify its own allocator functions. The
 application must provide the following pluggable allocator operations:
@@ -416,14 +413,12 @@ argument \fIsz\fR must exactly match the original allocation.
 The disposition of the allocated objects and the memory used to store them is
 left to the allocator implementation.
 .SH RETURN VALUES
-.sp
 .LP
 These functions return 0 on success and an error value on failure.
 .sp
 .LP
 The \fBnvlist_lookup_nv_alloc()\fR function returns a pointer to an allocator.
 .SH ERRORS
-.sp
 .LP
 These functions will fail if:
 .sp
@@ -473,7 +468,6 @@ An encode/decode method is not supported.
 .RE
 
 .SH EXAMPLES
-.sp
 .in +2
 .nf
 /*
@@ -574,7 +568,6 @@ main(int argc, char *argv[])
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -592,6 +585,5 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlibnvpair\fR(3LIB), \fBattributes\fR(5), \fBnvlist_alloc\fR(9F)
diff --git a/usr/src/man/man9f/nvlist_alloc.9f b/usr/src/man/man9f/nvlist_alloc.9f
index 2be889660e..8ee31ff69d 100644
--- a/usr/src/man/man9f/nvlist_alloc.9f
+++ b/usr/src/man/man9f/nvlist_alloc.9f
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH NVLIST_ALLOC 9F "Jan 16, 2006"
+.TH NVLIST_ALLOC 9F "Feb 15, 2016"
 .SH NAME
 nvlist_alloc, nvlist_free, nvlist_size, nvlist_pack, nvlist_unpack, nvlist_dup,
 nv_alloc_init, nv_alloc_fini, nvlist_xalloc, nvlist_xpack, nvlist_xunpack,
@@ -104,11 +104,9 @@ Pluggable Allocation Initialization with Fixed Allocator:
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris DDI specific (Solaris DDI)
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fInvlp\fR\fR
@@ -236,7 +234,6 @@ Points to a nv_alloc_t structure to be used for the specified \fBnvlist_t\fR.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 List Manipulation:
 .sp
@@ -259,7 +256,8 @@ The \fBnvlist_xalloc()\fR function differs from \fBnvlist_alloc()\fR in that
 Pluggable Allocators section.
 .sp
 .LP
-The \fBnvlist_free()\fR function frees a name-value pair list.
+The \fBnvlist_free()\fR function frees a name-value pair list. If \fInvl\fR
+is a null pointer, no action occurs.
 .sp
 .LP
 The \fBnvlist_size()\fR function returns the minimum size of a contiguous
@@ -338,7 +336,6 @@ has the type \fBNV_UNIQUE_NAME_TYPE\fR).
 The \fBnvlist_lookup_nv_alloc()\fR function retrieves the pointer to the
 allocator used when manipulating a name-value pair list.
 .SS "PLUGGABLE ALLOCATORS"
-.sp
 .LP
 Using Pluggable Allocators:
 .sp
@@ -422,7 +419,6 @@ When invoked on a fixed-buffer, the \fBnv_alloc_reset()\fR function resets the
 fixed buffer and prepares it for re-use. The framework consumer is responsible
 for freeing the buffer passed to \fBnv_alloc_init()\fR.
 .SS "CREATING PLUGGABLE ALLOCATORS"
-.sp
 .LP
 Any producer of name-value pairs may possibily specify his own allocator
 routines. You must provide the following pluggable allocator operations in the
@@ -472,7 +468,6 @@ must exactly match the original allocation.
 The disposition of the allocated objects and the memory used to store them is
 left to the allocator implementation.
 .SH RETURN VALUES
-.sp
 .LP
 For \fBnvlist_alloc()\fR, \fBnvlist_dup()\fR, \fBnvlist_xalloc()\fR, and
 \fBnvlist_xdup()\fR:
@@ -580,13 +575,11 @@ For \fBnvlist_lookup_nv_alloc()\fR:
 .LP
 pointer to the allocator
 .SH USAGE
-.sp
 .LP
 The fixed-buffer allocator is very simple allocator. It uses a pre-allocated
 buffer for memory allocations and it can be used in interrupt context. You are
 responsible for allocation and de-allocation for the pre-allocated buffer.
 .SH EXAMPLES
-.sp
 .in +2
 .nf
   /*
@@ -634,7 +627,6 @@ responsible for allocation and de-allocation for the pre-allocated buffer.
 .in -2
 
 .SH CONTEXT
-.sp
 .LP
 The \fBnvlist_alloc()\fR, \fBnvlist_pack()\fR, \fBnvlist_unpack()\fR, and
 \fBnvlist_dup()\fR functions can be called from interrupt context only if the
diff --git a/usr/src/uts/common/avs/ns/nsctl/nsc_trap.c b/usr/src/uts/common/avs/ns/nsctl/nsc_trap.c
index 156aff7dcb..e66a04b71e 100644
--- a/usr/src/uts/common/avs/ns/nsctl/nsc_trap.c
+++ b/usr/src/uts/common/avs/ns/nsctl/nsc_trap.c
@@ -71,8 +71,7 @@ nsc_do_sysevent(char *driver_name, char *trap_messages, int errorno,
 		rc = ddi_log_sysevent(info_dip, DDI_VENDOR_SUNW,
 		    SVE_II_CLASS, component, attr_list, NULL, DDI_SLEEP);
 out:
-	if (attr_list)
-		nvlist_free(attr_list);
+	nvlist_free(attr_list);
 
 	if (rc != 0) {
 		cmn_err(CE_WARN, "!%s: unable to log sysevent %d:%s and %d",
diff --git a/usr/src/uts/common/contract/device.c b/usr/src/uts/common/contract/device.c
index 1517bbbe9e..1fc46fab78 100644
--- a/usr/src/uts/common/contract/device.c
+++ b/usr/src/uts/common/contract/device.c
@@ -1923,8 +1923,7 @@ contract_device_publish(dev_info_t *dip, dev_t dev, int spec_type,
 	mutex_exit(&(DEVI(dip)->devi_ct_lock));
 
 out:
-	if (tnvl)
-		nvlist_free(tnvl);
+	nvlist_free(tnvl);
 	if (path)
 		kmem_free(path, MAXPATHLEN);
 
diff --git a/usr/src/uts/common/fs/dev/sdev_ncache.c b/usr/src/uts/common/fs/dev/sdev_ncache.c
index 07c93ca041..830d4741ef 100644
--- a/usr/src/uts/common/fs/dev/sdev_ncache.c
+++ b/usr/src/uts/common/fs/dev/sdev_ncache.c
@@ -341,8 +341,7 @@ sdev_ncache_pack_list(nvf_handle_t fd, nvlist_t **ret_nvl)
 	return (DDI_SUCCESS);
 
 err:
-	if (sub_nvl)
-		nvlist_free(sub_nvl);
+	nvlist_free(sub_nvl);
 	nvlist_free(nvl);
 	*ret_nvl = NULL;
 	return (DDI_FAILURE);
diff --git a/usr/src/uts/common/fs/dev/sdev_subr.c b/usr/src/uts/common/fs/dev/sdev_subr.c
index b4b27e6285..7f8f968454 100644
--- a/usr/src/uts/common/fs/dev/sdev_subr.c
+++ b/usr/src/uts/common/fs/dev/sdev_subr.c
@@ -160,16 +160,11 @@ static void
 sdev_prof_free(struct sdev_node *dv)
 {
 	ASSERT(!SDEV_IS_GLOBAL(dv));
-	if (dv->sdev_prof.dev_name)
-		nvlist_free(dv->sdev_prof.dev_name);
-	if (dv->sdev_prof.dev_map)
-		nvlist_free(dv->sdev_prof.dev_map);
-	if (dv->sdev_prof.dev_symlink)
-		nvlist_free(dv->sdev_prof.dev_symlink);
-	if (dv->sdev_prof.dev_glob_incdir)
-		nvlist_free(dv->sdev_prof.dev_glob_incdir);
-	if (dv->sdev_prof.dev_glob_excdir)
-		nvlist_free(dv->sdev_prof.dev_glob_excdir);
+	nvlist_free(dv->sdev_prof.dev_name);
+	nvlist_free(dv->sdev_prof.dev_map);
+	nvlist_free(dv->sdev_prof.dev_symlink);
+	nvlist_free(dv->sdev_prof.dev_glob_incdir);
+	nvlist_free(dv->sdev_prof.dev_glob_excdir);
 	bzero(&dv->sdev_prof, sizeof (dv->sdev_prof));
 }
 
diff --git a/usr/src/uts/common/fs/nfs/nfs4_state.c b/usr/src/uts/common/fs/nfs/nfs4_state.c
index 9f743caf70..47941454bc 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_state.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_state.c
@@ -1066,8 +1066,7 @@ rfs4_dss_setpaths(char *buf, size_t buflen)
 		 * Before we lose the ptr, destroy the nvlist and pathnames
 		 * array from the warm start before this one.
 		 */
-		if (rfs4_dss_oldpaths)
-			nvlist_free(rfs4_dss_oldpaths);
+		nvlist_free(rfs4_dss_oldpaths);
 		rfs4_dss_oldpaths = rfs4_dss_paths;
 	}
 
@@ -1465,10 +1464,8 @@ rfs4_state_fini()
 	rfs4_seen_first_compound = 0;
 
 	/* DSS: distributed stable storage */
-	if (rfs4_dss_oldpaths)
-		nvlist_free(rfs4_dss_oldpaths);
-	if (rfs4_dss_paths)
-		nvlist_free(rfs4_dss_paths);
+	nvlist_free(rfs4_dss_oldpaths);
+	nvlist_free(rfs4_dss_paths);
 	rfs4_dss_paths = rfs4_dss_oldpaths = NULL;
 }
 
diff --git a/usr/src/uts/common/fs/smbsrv/smb_kshare.c b/usr/src/uts/common/fs/smbsrv/smb_kshare.c
index bf3129d130..2781c0b2a9 100644
--- a/usr/src/uts/common/fs/smbsrv/smb_kshare.c
+++ b/usr/src/uts/common/fs/smbsrv/smb_kshare.c
@@ -428,8 +428,7 @@ smb_kshare_export_list(smb_ioc_share_t *ioc)
 	rc = 0;
 
 out:
-	if (shrlist != NULL)
-		nvlist_free(shrlist);
+	nvlist_free(shrlist);
 	smb_server_release(sv);
 	return (rc);
 }
@@ -490,8 +489,7 @@ smb_kshare_unexport_list(smb_ioc_share_t *ioc)
 	rc = 0;
 
 out:
-	if (shrlist != NULL)
-		nvlist_free(shrlist);
+	nvlist_free(shrlist);
 	smb_server_release(sv);
 	return (rc);
 }
diff --git a/usr/src/uts/common/fs/zfs/spa.c b/usr/src/uts/common/fs/zfs/spa.c
index 1edac65700..decc58fdb3 100644
--- a/usr/src/uts/common/fs/zfs/spa.c
+++ b/usr/src/uts/common/fs/zfs/spa.c
@@ -6006,8 +6006,7 @@ spa_sync_config_object(spa_t *spa, dmu_tx_t *tx)
 
 	spa_config_exit(spa, SCL_STATE, FTAG);
 
-	if (spa->spa_config_syncing)
-		nvlist_free(spa->spa_config_syncing);
+	nvlist_free(spa->spa_config_syncing);
 	spa->spa_config_syncing = config;
 
 	spa_sync_nvlist(spa, spa->spa_config_object, config, tx);
diff --git a/usr/src/uts/common/fs/zfs/spa_config.c b/usr/src/uts/common/fs/zfs/spa_config.c
index 47bb595908..69fe1f8e77 100644
--- a/usr/src/uts/common/fs/zfs/spa_config.c
+++ b/usr/src/uts/common/fs/zfs/spa_config.c
@@ -344,8 +344,7 @@ void
 spa_config_set(spa_t *spa, nvlist_t *config)
 {
 	mutex_enter(&spa->spa_props_lock);
-	if (spa->spa_config != NULL)
-		nvlist_free(spa->spa_config);
+	nvlist_free(spa->spa_config);
 	spa->spa_config = config;
 	mutex_exit(&spa->spa_props_lock);
 }
diff --git a/usr/src/uts/common/fs/zfs/zfs_ioctl.c b/usr/src/uts/common/fs/zfs/zfs_ioctl.c
index ae66e4261f..87a2a99086 100644
--- a/usr/src/uts/common/fs/zfs/zfs_ioctl.c
+++ b/usr/src/uts/common/fs/zfs/zfs_ioctl.c
@@ -1558,8 +1558,7 @@ zfs_ioc_pool_import(zfs_cmd_t *zc)
 
 	nvlist_free(config);
 
-	if (props)
-		nvlist_free(props);
+	nvlist_free(props);
 
 	return (error);
 }
diff --git a/usr/src/uts/common/io/comstar/lu/stmf_sbd/sbd.c b/usr/src/uts/common/io/comstar/lu/stmf_sbd/sbd.c
index e8a4b13138..81e63367c5 100644
--- a/usr/src/uts/common/io/comstar/lu/stmf_sbd/sbd.c
+++ b/usr/src/uts/common/io/comstar/lu/stmf_sbd/sbd.c
@@ -3639,8 +3639,7 @@ again:
 		}
 	}
 out:
-	if (nv != NULL)
-		nvlist_free(nv);
+	nvlist_free(nv);
 	kmem_free((void *)(uintptr_t)zc->zc_nvlist_dst, size);
 	kmem_free(zc, sizeof (zfs_cmd_t));
 	(void) ldi_close(zfs_lh, FREAD|FWRITE, kcred);
diff --git a/usr/src/uts/common/io/comstar/port/iscsit/iscsit.c b/usr/src/uts/common/io/comstar/port/iscsit/iscsit.c
index 1e852526c3..5d2d4e77b4 100644
--- a/usr/src/uts/common/io/comstar/port/iscsit/iscsit.c
+++ b/usr/src/uts/common/io/comstar/port/iscsit/iscsit.c
@@ -563,8 +563,7 @@ cleanup:
 			it_config_free_cmn(cfg);
 		if (cfg_pnvlist)
 			kmem_free(cfg_pnvlist, setcfg.set_cfg_pnvlist_len);
-		if (cfg_nvlist)
-			nvlist_free(cfg_nvlist);
+		nvlist_free(cfg_nvlist);
 
 		/*
 		 * Now that the reconfig is complete set our state back to
diff --git a/usr/src/uts/common/io/comstar/port/pppt/alua_ic_if.c b/usr/src/uts/common/io/comstar/port/pppt/alua_ic_if.c
index 2bff5afef1..65e0c3d23b 100644
--- a/usr/src/uts/common/io/comstar/port/pppt/alua_ic_if.c
+++ b/usr/src/uts/common/io/comstar/port/pppt/alua_ic_if.c
@@ -355,8 +355,7 @@ stmf_ic_tx_msg(stmf_ic_msg_t *msg)
 	status = stmf_ic_transmit(buf, size);
 
 done:
-	if (nvl)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	if (buf)
 		kmem_free(buf, size);
@@ -971,8 +970,7 @@ stmf_ic_msg_free(stmf_ic_msg_t *msg)
 		ASSERT(0);
 	}
 
-	if (msg->icm_nvlist)
-		nvlist_free(msg->icm_nvlist);
+	nvlist_free(msg->icm_nvlist);
 
 	kmem_free(msg, sizeof (*msg));
 }
@@ -1176,8 +1174,7 @@ done:
 	if (!rc)
 		return (nvl);
 
-	if (nvl)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	return (NULL);
 }
diff --git a/usr/src/uts/common/io/comstar/stmf/stmf.c b/usr/src/uts/common/io/comstar/stmf/stmf.c
index 2cc69a6e38..37d79a371c 100644
--- a/usr/src/uts/common/io/comstar/stmf/stmf.c
+++ b/usr/src/uts/common/io/comstar/stmf/stmf.c
@@ -2525,8 +2525,7 @@ stmf_load_ppd_ioctl(stmf_ppioctl_data_t *ppi, uint64_t *ppi_token,
 	}
 
 	/* Free any existing lists and add this one to the ppd */
-	if (ppd->ppd_nv)
-		nvlist_free(ppd->ppd_nv);
+	nvlist_free(ppd->ppd_nv);
 	ppd->ppd_nv = nv;
 
 	/* set the token for writes */
@@ -2598,8 +2597,7 @@ stmf_delete_ppd(stmf_pp_data_t *ppd)
 		return;
 
 	*pppd = ppd->ppd_next;
-	if (ppd->ppd_nv)
-		nvlist_free(ppd->ppd_nv);
+	nvlist_free(ppd->ppd_nv);
 
 	kmem_free(ppd, ppd->ppd_alloc_size);
 }
diff --git a/usr/src/uts/common/io/devfm.c b/usr/src/uts/common/io/devfm.c
index 221338de7e..eb5e24079e 100644
--- a/usr/src/uts/common/io/devfm.c
+++ b/usr/src/uts/common/io/devfm.c
@@ -298,12 +298,10 @@ fm_ioctl(dev_t dev, int cmd, intptr_t data, int flag, cred_t *cred, int *rvalp)
 
 	err = subr->func(cmd, invl, &onvl);
 
-	if (invl != NULL)
-		nvlist_free(invl);
+	nvlist_free(invl);
 
 	if (err != 0) {
-		if (onvl != NULL)
-			nvlist_free(onvl);
+		nvlist_free(onvl);
 		return (err);
 	}
 
@@ -425,8 +423,7 @@ _fini(void)
 	int ret;
 
 	if ((ret = mod_remove(&modlinkage)) == 0) {
-		if (fm_vers_nvl != NULL)
-			nvlist_free(fm_vers_nvl);
+		nvlist_free(fm_vers_nvl);
 	}
 
 	return (ret);
diff --git a/usr/src/uts/common/ipp/ippctl.c b/usr/src/uts/common/ipp/ippctl.c
index 240de00398..6d368a653b 100644
--- a/usr/src/uts/common/ipp/ippctl.c
+++ b/usr/src/uts/common/ipp/ippctl.c
@@ -1243,8 +1243,7 @@ ippctl_action_modify(
 	 */
 
 	if ((rc = ippctl_set_rc(ipp_rc)) != 0) {
-		if (nvlp != NULL)
-			nvlist_free(nvlp);
+		nvlist_free(nvlp);
 		return (rc);
 	}
 
diff --git a/usr/src/uts/common/os/contract.c b/usr/src/uts/common/os/contract.c
index f3c888a1db..249066674e 100644
--- a/usr/src/uts/common/os/contract.c
+++ b/usr/src/uts/common/os/contract.c
@@ -1837,10 +1837,8 @@ cte_rele(ct_kevent_t *e)
 	contract_rele(e->cte_contract);
 
 	mutex_destroy(&e->cte_lock);
-	if (e->cte_data)
-		nvlist_free(e->cte_data);
-	if (e->cte_gdata)
-		nvlist_free(e->cte_gdata);
+	nvlist_free(e->cte_data);
+	nvlist_free(e->cte_gdata);
 	kmem_free(e, sizeof (ct_kevent_t));
 }
 
diff --git a/usr/src/uts/common/os/damap.c b/usr/src/uts/common/os/damap.c
index e311d75867..f90c5569c4 100644
--- a/usr/src/uts/common/os/damap.c
+++ b/usr/src/uts/common/os/damap.c
@@ -1110,12 +1110,10 @@ dam_deact_cleanup(dam_t *mapp, id_t addrid, char *addrstr,
 	mutex_enter(&mapp->dam_lock);
 	bitset_del(&mapp->dam_active_set, addrid);
 	passp->da_ppriv = NULL;
-	if (passp->da_nvl)
-		nvlist_free(passp->da_nvl);
+	nvlist_free(passp->da_nvl);
 	passp->da_nvl = NULL;
 	passp->da_ppriv_rpt = NULL;
-	if (passp->da_nvl_rpt)
-		nvlist_free(passp->da_nvl_rpt);
+	nvlist_free(passp->da_nvl_rpt);
 	passp->da_nvl_rpt = NULL;
 
 	DTRACE_PROBE3(damap__addr__deactivate__end,
@@ -1658,8 +1656,7 @@ dam_addr_report_release(dam_t *mapp, id_t addrid)
 		mutex_enter(&mapp->dam_lock);
 	}
 	passp->da_ppriv_rpt = NULL;
-	if (passp->da_nvl_rpt)
-		nvlist_free(passp->da_nvl_rpt);
+	nvlist_free(passp->da_nvl_rpt);
 }
 
 /*
diff --git a/usr/src/uts/common/os/devid_cache.c b/usr/src/uts/common/os/devid_cache.c
index a12a589f4c..baa8ab845b 100644
--- a/usr/src/uts/common/os/devid_cache.c
+++ b/usr/src/uts/common/os/devid_cache.c
@@ -343,8 +343,7 @@ devid_cache_pack_list(nvf_handle_t fd, nvlist_t **ret_nvl)
 	return (DDI_SUCCESS);
 
 err:
-	if (sub_nvl)
-		nvlist_free(sub_nvl);
+	nvlist_free(sub_nvl);
 	nvlist_free(nvl);
 	*ret_nvl = NULL;
 	return (DDI_FAILURE);
diff --git a/usr/src/uts/common/os/evchannels.c b/usr/src/uts/common/os/evchannels.c
index 3495dcfcfa..092dd42f2e 100644
--- a/usr/src/uts/common/os/evchannels.c
+++ b/usr/src/uts/common/os/evchannels.c
@@ -1164,8 +1164,7 @@ evch_chunbind(evch_bind_t *bp)
 		mutex_exit(&chp->ch_mutex);
 		evch_dl_del(&eg->evch_list, &chp->ch_link);
 		evch_evq_destroy(chp->ch_queue);
-		if (chp->ch_propnvl)
-			nvlist_free(chp->ch_propnvl);
+		nvlist_free(chp->ch_propnvl);
 		mutex_destroy(&chp->ch_mutex);
 		mutex_destroy(&chp->ch_pubmx);
 		cv_destroy(&chp->ch_pubcv);
@@ -1572,8 +1571,7 @@ evch_chsetpropnvl(evch_bind_t *bp, nvlist_t *nvl)
 
 	mutex_enter(&chp->ch_mutex);
 
-	if (chp->ch_propnvl)
-		nvlist_free(chp->ch_propnvl);
+	nvlist_free(chp->ch_propnvl);
 
 	chp->ch_propnvl = nvl;
 	chp->ch_propnvlgen++;
diff --git a/usr/src/uts/common/os/retire_store.c b/usr/src/uts/common/os/retire_store.c
index f1c3db9445..a934379af4 100644
--- a/usr/src/uts/common/os/retire_store.c
+++ b/usr/src/uts/common/os/retire_store.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/ddi.h>
 #include <sys/sunddi.h>
 #include <sys/sunndi.h>
@@ -310,8 +308,7 @@ rio_store_encode(nvf_handle_t nvfh, nvlist_t **ret_nvl)
 	return (DDI_SUCCESS);
 
 error:
-	if (line_nvl)
-		nvlist_free(line_nvl);
+	nvlist_free(line_nvl);
 	ASSERT(nvl);
 	nvlist_free(nvl);
 	return (DDI_FAILURE);
diff --git a/usr/src/uts/common/os/sunmdi.c b/usr/src/uts/common/os/sunmdi.c
index a84dfc74de..63645cfe54 100644
--- a/usr/src/uts/common/os/sunmdi.c
+++ b/usr/src/uts/common/os/sunmdi.c
@@ -8029,8 +8029,7 @@ vhcache_to_mainnvl(mdi_vhci_cache_t *vhcache)
 
 	rw_exit(&vhcache->vhcache_lock);
 out:
-	if (nvl)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	return (NULL);
 }
 
diff --git a/usr/src/uts/common/os/sunndi.c b/usr/src/uts/common/os/sunndi.c
index 04a07fde29..93c66fbcf9 100644
--- a/usr/src/uts/common/os/sunndi.c
+++ b/usr/src/uts/common/os/sunndi.c
@@ -420,8 +420,7 @@ ndi_dc_freehdl(struct devctl_iocdata *dcp)
 	if (dcp->c_unitaddr != NULL)
 		kmem_free(dcp->c_unitaddr, MAXNAMELEN);
 
-	if (dcp->nvl_user != NULL)
-		nvlist_free(dcp->nvl_user);
+	nvlist_free(dcp->nvl_user);
 
 	kmem_free(dcp, sizeof (*dcp));
 }
diff --git a/usr/src/uts/common/os/zone.c b/usr/src/uts/common/os/zone.c
index 706e5ed16f..9a1c41172b 100644
--- a/usr/src/uts/common/os/zone.c
+++ b/usr/src/uts/common/os/zone.c
@@ -4401,8 +4401,7 @@ zone_create(const char *zone_name, const char *zone_root,
 	 */
 	if (curthread != pp->p_agenttp && !holdlwps(SHOLDFORK)) {
 		zone_free(zone);
-		if (rctls)
-			nvlist_free(rctls);
+		nvlist_free(rctls);
 		return (zone_create_error(error, 0, extended_error));
 	}
 
@@ -4412,8 +4411,7 @@ zone_create(const char *zone_name, const char *zone_root,
 			continuelwps(pp);
 		mutex_exit(&pp->p_lock);
 		zone_free(zone);
-		if (rctls)
-			nvlist_free(rctls);
+		nvlist_free(rctls);
 		return (zone_create_error(error, 0, extended_error));
 	}
 
@@ -4558,8 +4556,7 @@ zone_create(const char *zone_name, const char *zone_root,
 	 * The zone is fully visible, so we can let mounts progress.
 	 */
 	resume_mounts(zone);
-	if (rctls)
-		nvlist_free(rctls);
+	nvlist_free(rctls);
 
 	return (zoneid);
 
@@ -4574,8 +4571,7 @@ errout:
 	mutex_exit(&pp->p_lock);
 
 	resume_mounts(zone);
-	if (rctls)
-		nvlist_free(rctls);
+	nvlist_free(rctls);
 	/*
 	 * There is currently one reference to the zone, a cred_ref from
 	 * zone_kcred.  To free the zone, we call crfree, which will call
@@ -6875,8 +6871,7 @@ zone_remove_datalink(zoneid_t zoneid, datalink_id_t linkid)
 		err = ENXIO;
 	} else {
 		list_remove(&zone->zone_dl_list, zdl);
-		if (zdl->zdl_net != NULL)
-			nvlist_free(zdl->zdl_net);
+		nvlist_free(zdl->zdl_net);
 		kmem_free(zdl, sizeof (zone_dl_t));
 	}
 	mutex_exit(&zone->zone_lock);
diff --git a/usr/src/uts/common/xen/os/xvdi.c b/usr/src/uts/common/xen/os/xvdi.c
index d30da59dc8..85dd5d7d81 100644
--- a/usr/src/uts/common/xen/os/xvdi.c
+++ b/usr/src/uts/common/xen/os/xvdi.c
@@ -1744,8 +1744,7 @@ xvdi_post_event(dev_info_t *dip, xendev_hotplug_cmd_t hpc)
 	}
 
 failure:
-	if (attr_list != NULL)
-		nvlist_free(attr_list);
+	nvlist_free(attr_list);
 
 	return (err);
 }
diff --git a/usr/src/uts/intel/io/intel_nb5000/intel_nbdrv.c b/usr/src/uts/intel/io/intel_nb5000/intel_nbdrv.c
index ce4f8919be..3c93988806 100644
--- a/usr/src/uts/intel/io/intel_nb5000/intel_nbdrv.c
+++ b/usr/src/uts/intel/io/intel_nb5000/intel_nbdrv.c
@@ -313,8 +313,7 @@ inb_create_nvl()
 		    (uint8_t)nb_number_memory_controllers);
 	inb_dimmlist(nvl);
 
-	if (inb_mc_nvl)
-		nvlist_free(inb_mc_nvl);
+	nvlist_free(inb_mc_nvl);
 	inb_mc_nvl = nvl;
 }
 
diff --git a/usr/src/uts/intel/io/intel_nhm/dimm_topo.c b/usr/src/uts/intel/io/intel_nhm/dimm_topo.c
index 92dfb8c62c..d1b835d94b 100644
--- a/usr/src/uts/intel/io/intel_nhm/dimm_topo.c
+++ b/usr/src/uts/intel/io/intel_nhm/dimm_topo.c
@@ -262,7 +262,6 @@ inhm_create_nvl(int chip)
 	(void) nvlist_add_uint8(nvl, MCINTEL_NVLIST_NRANKS, 4);
 	inhm_dimmlist(chip, nvl);
 
-	if (inhm_mc_nvl[chip])
-		nvlist_free(inhm_mc_nvl[chip]);
+	nvlist_free(inhm_mc_nvl[chip]);
 	inhm_mc_nvl[chip] = nvl;
 }
diff --git a/usr/src/uts/intel/io/pci/pci_boot.c b/usr/src/uts/intel/io/pci/pci_boot.c
index 7b535b81e3..d776201ec4 100644
--- a/usr/src/uts/intel/io/pci/pci_boot.c
+++ b/usr/src/uts/intel/io/pci/pci_boot.c
@@ -366,8 +366,7 @@ pci_cache_pack_nvlist(nvf_handle_t hdl, nvlist_t **ret_nvl)
 	return (DDI_SUCCESS);
 
 error:
-	if (sub_nvl)
-		nvlist_free(sub_nvl);
+	nvlist_free(sub_nvl);
 	ASSERT(nvl);
 	nvlist_free(nvl);
 	*ret_nvl = NULL;