12577 px: NULL pointer errors

Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Approved by: Dan McDonald <danmcd@joyent.com>

11 files changed, 44 insertions, 99 deletions

diff --git a/usr/src/uts/sun4/io/px/px.c b/usr/src/uts/sun4/io/px/px.c
index 6d9c5797c4..82948b2609 100644
--- a/usr/src/uts/sun4/io/px/px.c
+++ b/usr/src/uts/sun4/io/px/px.c
@@ -44,8 +44,6 @@
 #include <sys/pcie_pwr.h>
 #include <sys/pci_cfgacc.h>
 
-/*LINTLIBRARY*/
-
 /*
  * function prototypes for dev ops routines:
  */
@@ -226,7 +224,7 @@ px_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
 	px_t		*px_p;	/* per bus state pointer */
 	int		instance = DIP_TO_INST(dip);
 	int		ret = DDI_SUCCESS;
-	devhandle_t	dev_hdl = NULL;
+	devhandle_t	dev_hdl = 0;
 	pcie_hp_regops_t regops;
 	pcie_bus_t	*bus_p;
 
@@ -521,7 +519,7 @@ px_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
 		mutex_exit(&px_p->px_mutex);
 		mutex_destroy(&px_p->px_mutex);
 
-		px_p->px_dev_hdl = NULL;
+		px_p->px_dev_hdl = 0;
 		ddi_soft_state_free(px_state_p, instance);
 
 		return (DDI_SUCCESS);
@@ -688,7 +686,7 @@ px_pwr_teardown(dev_info_t *dip)
 	px_t *px_p = INST_TO_STATE(instance);
 	ddi_intr_handle_impl_t	hdl;
 
-	if (!PCIE_PMINFO(dip) || !PCIE_NEXUS_PMINFO(dip))
+	if (PCIE_PMINFO(dip) == NULL || PCIE_NEXUS_PMINFO(dip) == NULL)
 		return;
 
 	/* Initialize handle */
@@ -848,7 +846,8 @@ px_dma_setup(dev_info_t *dip, dev_info_t *rdip, ddi_dma_req_t *dmareq,
 	    ddi_driver_name(rdip), ddi_get_instance(rdip),
 	    handlep ? "alloc" : "advisory");
 
-	if (!(mp = px_dma_lmts2hdl(dip, rdip, mmu_p, dmareq)))
+	mp = px_dma_lmts2hdl(dip, rdip, mmu_p, dmareq);
+	if (mp == NULL)
 		return (DDI_DMA_NORESOURCES);
 	if (mp == (ddi_dma_impl_t *)DDI_DMA_NOMAPPING)
 		return (DDI_DMA_NOMAPPING);
@@ -858,14 +857,14 @@ px_dma_setup(dev_info_t *dip, dev_info_t *rdip, ddi_dma_req_t *dmareq,
 		goto freehandle;
 
 	switch (PX_DMA_TYPE(mp)) {
-	case PX_DMAI_FLAGS_DVMA:	/* LINTED E_EQUALITY_NOT_ASSIGNMENT */
-		if ((ret = px_dvma_win(px_p, dmareq, mp)) || !handlep)
+	case PX_DMAI_FLAGS_DVMA:
+		ret = px_dvma_win(px_p, dmareq, mp);
+		if (ret != 0 || handlep == NULL)
 			goto freehandle;
 		if (!PX_DMA_CANCACHE(mp)) {	/* try fast track */
 			if (PX_DMA_CANFAST(mp)) {
 				if (!px_dvma_map_fast(mmu_p, mp))
 					break;
-			/* LINTED E_NOP_ELSE_STMT */
 			} else {
 				PX_DVMA_FASTTRAK_PROF(mp);
 			}
@@ -873,8 +872,9 @@ px_dma_setup(dev_info_t *dip, dev_info_t *rdip, ddi_dma_req_t *dmareq,
 		if (ret = px_dvma_map(mp, dmareq, mmu_p))
 			goto freehandle;
 		break;
-	case PX_DMAI_FLAGS_PTP:	/* LINTED E_EQUALITY_NOT_ASSIGNMENT */
-		if ((ret = px_dma_physwin(px_p, dmareq, mp)) || !handlep)
+	case PX_DMAI_FLAGS_PTP:
+		ret = px_dma_physwin(px_p, dmareq, mp);
+		if (ret == 0 || handlep == NULL)
 			goto freehandle;
 		break;
 	case PX_DMAI_FLAGS_BYPASS:
@@ -915,7 +915,8 @@ px_dma_allochdl(dev_info_t *dip, dev_info_t *rdip, ddi_dma_attr_t *attrp,
 	if (attrp->dma_attr_version != DMA_ATTR_V0)
 		return (DDI_DMA_BADATTR);
 
-	if (!(mp = px_dma_allocmp(dip, rdip, waitfp, arg)))
+	mp = px_dma_allocmp(dip, rdip, waitfp, arg);
+	if (mp == NULL)
 		return (DDI_DMA_NORESOURCES);
 
 	/*
@@ -989,7 +990,7 @@ px_dma_bindhdl(dev_info_t *dip, dev_info_t *rdip,
 		if (!PX_DMA_CANCACHE(mp)) {	/* try fast track */
 			if (PX_DMA_CANFAST(mp)) {
 				if (!px_dvma_map_fast(mmu_p, mp))
-					goto mapped; /*LINTED E_NOP_ELSE_STMT*/
+					goto mapped;
 			} else {
 				PX_DVMA_FASTTRAK_PROF(mp);
 			}
diff --git a/usr/src/uts/sun4/io/px/px_fm.c b/usr/src/uts/sun4/io/px/px_fm.c
index 9db9e7e50a..5f0de5be0a 100644
--- a/usr/src/uts/sun4/io/px/px_fm.c
+++ b/usr/src/uts/sun4/io/px/px_fm.c
@@ -329,7 +329,7 @@ px_fm_callback(dev_info_t *dip, ddi_fm_error_t *derr, const void *impl_data)
 			switch (ranges_p->child_high & PCI_ADDR_MASK) {
 			case PCI_ADDR_CONFIG:
 				acc_type = PF_ADDR_CFG;
-				addr = NULL;
+				addr = 0;
 				bdf = (pcie_req_id_t)((fault_addr >> 12) &
 				    0xFFFF);
 				break;
@@ -448,7 +448,7 @@ px_err_fabric_intr(px_t *px_p, msgcode_t msg_code, pcie_req_id_t rid)
 	}
 
 	/* Ensure that the rid of the fabric message will get scanned. */
-	pfd_p = px_rp_en_q(px_p, rid, NULL, NULL);
+	pfd_p = px_rp_en_q(px_p, rid, 0, 0);
 	PCIE_ROOT_EH_SRC(pfd_p)->intr_type = PF_INTR_TYPE_FABRIC;
 
 	rc_err = px_err_cmn_intr(px_p, &derr, PX_INTR_CALL, PX_FM_BLOCK_PCIE);
@@ -739,7 +739,7 @@ px_get_pfd(px_t *px_p) {
 	PCIE_ROOT_FAULT(pfd_p)->scan_addr = 0;
 	PCIE_ROOT_EH_SRC(pfd_p)->intr_type = PF_INTR_TYPE_NONE;
 	PCIE_ROOT_EH_SRC(pfd_p)->intr_data = NULL;
-	PFD_AFFECTED_DEV(pfd_p)->pe_affected_flags = NULL;
+	PFD_AFFECTED_DEV(pfd_p)->pe_affected_flags = 0;
 	PFD_AFFECTED_DEV(pfd_p)->pe_affected_bdf = PCIE_INVALID_BDF;
 	PCI_BDG_ERR_REG(pfd_p)->pci_bdg_sec_stat = 0;
 	PCIE_ADV_REG(pfd_p)->pcie_ce_status = 0;
@@ -890,7 +890,7 @@ px_err_pio_hdl_check(dev_info_t *dip, const void *handle, const void *arg1,
 	 */
 	size = hp->ah_len;
 	if (((fault_addr >= base_addr) && (fault_addr < (base_addr + size))) ||
-	    ((fault_addr == NULL) && (PCIE_CHECK_VALID_BDF(bdf) &&
+	    ((fault_addr == 0) && (PCIE_CHECK_VALID_BDF(bdf) &&
 	    (bdf == PCIE_DIP2BUS(dip)->bus_bdf))))
 		status = DDI_FM_NONFATAL;
 
@@ -927,7 +927,7 @@ px_err_dma_hdl_check(dev_info_t *dip, const void *handle, const void *arg1,
 	 * know the BDF and ADDR == 0.
 	 */
 	if (((addr >= base_addr) && (addr < (base_addr + size))) ||
-	    ((addr == NULL) && PCIE_CHECK_VALID_BDF(bdf)))
+	    ((addr == 0) && PCIE_CHECK_VALID_BDF(bdf)))
 		status = DDI_FM_NONFATAL;
 
 	return (status);
diff --git a/usr/src/uts/sun4/io/px/px_tools.c b/usr/src/uts/sun4/io/px/px_tools.c
index 8d424f7957..ab089009fd 100644
--- a/usr/src/uts/sun4/io/px/px_tools.c
+++ b/usr/src/uts/sun4/io/px/px_tools.c
@@ -488,7 +488,7 @@ pxtool_get_phys_addr(px_t *px_p, int space, uint64_t offset)
 	    "space:0x%d, offset:0x%" PRIx64 "\n", space, offset);
 
 	if (rval != DDI_SUCCESS)
-		return (NULL);
+		return ((uintptr_t)NULL);
 
 	/* Bustype here returns the high order address bits. */
 	xlated_regspec.regspec_bustype &= px_get_rng_parent_hi_mask(px_p);
diff --git a/usr/src/uts/sun4/io/px/px_util.c b/usr/src/uts/sun4/io/px/px_util.c
index e2b4bdbbc4..893690a5d9 100644
--- a/usr/src/uts/sun4/io/px/px_util.c
+++ b/usr/src/uts/sun4/io/px/px_util.c
@@ -41,8 +41,6 @@
 #include "px_obj.h"
 #include <sys/pcie_pwr.h>
 
-/*LINTLIBRARY*/
-
 /*
  * px_get_props
  *
@@ -407,7 +405,7 @@ px_init_child(px_t *px_p, dev_info_t *child)
 	pci_regspec_t	*pci_rp;
 	char		name[10];
 	int		i, no_config;
-	intptr_t	ppd = NULL;
+	intptr_t	ppd = (intptr_t)NULL;
 
 	/*
 	 * The following is a special case for pcimem nodes.
diff --git a/usr/src/uts/sun4u/io/px/px_err.c b/usr/src/uts/sun4u/io/px/px_err.c
index 3ff353d2e9..5db4380371 100644
--- a/usr/src/uts/sun4u/io/px/px_err.c
+++ b/usr/src/uts/sun4u/io/px/px_err.c
@@ -570,14 +570,14 @@ px_err_bit_desc_t px_err_lpug_tbl[] = {
 
 /* LPU Registers Addresses */
 #define	LR4(pre) \
-	NULL, \
+	0, \
 	LPU_ ## pre ## _INTERRUPT_MASK, \
 	LPU_ ## pre ## _INTERRUPT_AND_STATUS, \
 	LPU_ ## pre ## _INTERRUPT_AND_STATUS
 
 /* LPU Registers Addresses with Irregularities */
 #define	LR4_FIXME(pre) \
-	NULL, \
+	0, \
 	LPU_ ## pre ## _INTERRUPT_MASK, \
 	LPU_ ## pre ## _LAYER_INTERRUPT_AND_STATUS, \
 	LPU_ ## pre ## _LAYER_INTERRUPT_AND_STATUS
@@ -737,7 +737,7 @@ px_err_reg_enable(px_err_id_t reg_id, caddr_t csr_base)
 	uint64_t 		log_mask = *reg_desc_p->log_mask_p;
 
 	/* Enable logs if it exists */
-	if (reg_desc_p->log_addr != NULL)
+	if (reg_desc_p->log_addr != 0)
 		CSR_XS(csr_base, reg_desc_p->log_addr, log_mask);
 
 	/*
@@ -758,7 +758,7 @@ px_err_reg_enable(px_err_id_t reg_id, caddr_t csr_base)
 	    CSR_XR(csr_base, reg_desc_p->status_addr));
 	DBG(DBG_ATTACH, NULL, "%s Clear: 0x%llx\n", reg_desc_p->msg,
 	    CSR_XR(csr_base, reg_desc_p->clear_addr));
-	if (reg_desc_p->log_addr != NULL) {
+	if (reg_desc_p->log_addr != 0) {
 		DBG(DBG_ATTACH, NULL, "%s Log: 0x%llx\n", reg_desc_p->msg,
 		    CSR_XR(csr_base, reg_desc_p->log_addr));
 	}
@@ -770,7 +770,7 @@ px_err_reg_disable(px_err_id_t reg_id, caddr_t csr_base)
 	const px_err_reg_desc_t	*reg_desc_p = &px_err_reg_tbl[reg_id];
 	uint64_t		val = (reg_id >= PX_ERR_LPU_LINK) ? -1 : 0;
 
-	if (reg_desc_p->log_addr != NULL)
+	if (reg_desc_p->log_addr != 0)
 		CSR_XS(csr_base, reg_desc_p->log_addr, val);
 	CSR_XS(csr_base, reg_desc_p->enable_addr, val);
 }
@@ -1722,7 +1722,7 @@ PX_ERPT_SEND_DEC(mmu_tfar_tfsr)
 		s_status = PCI_STAT_S_TARG_AB;
 
 		/* Only PIO Fault Addresses are valid, this is DMA */
-		(void) px_rp_en_q(px_p, fault_bdf, NULL, s_status);
+		(void) px_rp_en_q(px_p, fault_bdf, 0, s_status);
 	}
 
 	(void) snprintf(buf, FM_MAX_CLASS, "%s", class_name);
@@ -1793,8 +1793,7 @@ px_err_mmu_rbne_handle(dev_info_t *rpdip, caddr_t csr_base,
 		goto done;
 
 	bdf = (pcie_req_id_t)CSR_FR(csr_base, MMU_TRANSLATION_FAULT_STATUS, ID);
-	(void) pf_hdl_lookup(rpdip, derr->fme_ena, PF_ADDR_DMA, NULL,
-	    bdf);
+	(void) pf_hdl_lookup(rpdip, derr->fme_ena, PF_ADDR_DMA, 0, bdf);
 
 done:
 	return (px_err_no_panic_handle(rpdip, csr_base, derr, err_reg_descr,
@@ -1824,8 +1823,7 @@ px_err_mmu_tfa_handle(dev_info_t *rpdip, caddr_t csr_base,
 		goto done;
 
 	bdf = (pcie_req_id_t)CSR_FR(csr_base, MMU_TRANSLATION_FAULT_STATUS, ID);
-	(void) pf_hdl_lookup(rpdip, derr->fme_ena, PF_ADDR_DMA, NULL,
-	    bdf);
+	(void) pf_hdl_lookup(rpdip, derr->fme_ena, PF_ADDR_DMA, 0, bdf);
 
 done:
 	return (px_err_no_panic_handle(rpdip, csr_base, derr, err_reg_descr,
diff --git a/usr/src/uts/sun4u/io/px/px_lib4u.c b/usr/src/uts/sun4u/io/px/px_lib4u.c
index 57cbeac22f..1180f3fbd9 100644
--- a/usr/src/uts/sun4u/io/px/px_lib4u.c
+++ b/usr/src/uts/sun4u/io/px/px_lib4u.c
@@ -698,13 +698,9 @@ px_lib_dma_sync(dev_info_t *dip, dev_info_t *rdip, ddi_dma_handle_t handle,
 	 * CPU's internal "invalidate FIFOs" are flushed.
 	 */
 
-#if !defined(lint)
 	kpreempt_disable();
-#endif
 	jbus_stst_order();
-#if !defined(lint)
 	kpreempt_enable();
-#endif
 	return (DDI_SUCCESS);
 }
 
@@ -1416,7 +1412,7 @@ oberon_set_cb(dev_info_t *dip, uint64_t val)
 	 * register array.
 	 */
 	for (ubc_id = 0; ubc_id < OBERON_UBC_ID_MAX; ubc_id++) {
-		if (px_oberon_ubc_scratch_regs[ubc_id] != NULL)
+		if (px_oberon_ubc_scratch_regs[ubc_id] != 0)
 			return;
 	}
 
@@ -1559,7 +1555,7 @@ px_lib_clr_errs(px_t *px_p, dev_info_t *rdip, uint64_t addr)
 		}
 	}
 
-	(void) px_rp_en_q(px_p, bdf, addr_low, NULL);
+	(void) px_rp_en_q(px_p, bdf, addr_low, 0);
 
 	/*
 	 * XXX - Current code scans the fabric for all px_tool accesses.
@@ -1877,8 +1873,8 @@ px_goto_l23ready(px_t *px_p)
 	int		mutex_held = 1;
 
 	/* If no PM info, return failure */
-	if (!PCIE_PMINFO(px_p->px_dip) ||
-	    !(pwr_p = PCIE_NEXUS_PMINFO(px_p->px_dip)))
+	if (PCIE_PMINFO(px_p->px_dip) == NULL ||
+	    (pwr_p = PCIE_NEXUS_PMINFO(px_p->px_dip)) == NULL)
 		return (DDI_FAILURE);
 
 	mutex_enter(&pwr_p->pwr_lock);
@@ -2001,8 +1997,8 @@ px_pre_pwron_check(px_t *px_p)
 	pcie_pwr_t	*pwr_p;
 
 	/* If no PM info, return failure */
-	if (!PCIE_PMINFO(px_p->px_dip) ||
-	    !(pwr_p = PCIE_NEXUS_PMINFO(px_p->px_dip)))
+	if (PCIE_PMINFO(px_p->px_dip) == NULL ||
+	    (pwr_p = PCIE_NEXUS_PMINFO(px_p->px_dip)) == NULL)
 		return (DDI_FAILURE);
 
 	/*
@@ -2023,8 +2019,8 @@ px_goto_l0(px_t *px_p)
 	uint64_t	time_spent = 0;
 
 	/* If no PM info, return failure */
-	if (!PCIE_PMINFO(px_p->px_dip) ||
-	    !(pwr_p = PCIE_NEXUS_PMINFO(px_p->px_dip)))
+	if (PCIE_PMINFO(px_p->px_dip) == NULL ||
+	    (pwr_p = PCIE_NEXUS_PMINFO(px_p->px_dip)) == NULL)
 		return (DDI_FAILURE);
 
 	mutex_enter(&pwr_p->pwr_lock);
@@ -2139,7 +2135,7 @@ px_cb_intr_redist(void *arg)
 	mutex_enter(&cb_p->cb_mutex);
 
 	pxl = cb_p->pxl;
-	if (!pxl)
+	if (pxl == NULL)
 		goto cb_done;
 
 	pxp = pxl->pxp;
@@ -2275,7 +2271,7 @@ px_cb_rem_intr(px_fault_t *fault_p)
 		pxl = pxl->next;
 		for (; pxl && (pxl->pxp != px_p); prev = pxl, pxl = pxl->next) {
 		};
-		if (!pxl) {
+		if (pxl == NULL) {
 			cmn_err(CE_WARN, "px_cb_rem_intr: can't find px_p 0x%p "
 			    "in registered CB list.", (void *)px_p);
 			mutex_exit(&cb_p->cb_mutex);
@@ -2342,7 +2338,7 @@ px_cb_intr(caddr_t arg)
 
 	mutex_enter(&cb_p->cb_mutex);
 
-	if (!cb_p->pxl) {
+	if (cb_p->pxl == NULL) {
 		mutex_exit(&cb_p->cb_mutex);
 		return (DDI_INTR_UNCLAIMED);
 	}
diff --git a/usr/src/uts/sun4u/px/Makefile b/usr/src/uts/sun4u/px/Makefile
index 79ef780ea3..ca7c77da9c 100644
--- a/usr/src/uts/sun4u/px/Makefile
+++ b/usr/src/uts/sun4u/px/Makefile
@@ -39,7 +39,6 @@ UTSBASE	= ../..
 #
 MODULE		= px
 OBJECTS		= $(PX_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(PX_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 
 #
@@ -51,7 +50,6 @@ include $(UTSBASE)/sun4u/Makefile.sun4u
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 #
@@ -60,9 +58,6 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 INC_PATH	+= -I$(UTSBASE)/sun4/io/px
 INC_PATH	+= -I$(UTSBASE)/sun4u/io/px
 
-#
-# lint pass one enforcement
-#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -70,18 +65,6 @@ CFLAGS += $(CCVERBOSE)
 #
 CFLAGS += -dalign
 
-#
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
-# Please do not carry these forward to new Makefiles.
-#
-LINTTAGS	+= -erroff=E_SUSPICIOUS_COMPARISON
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-LINTTAGS	+= -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
-LINTTAGS	+= -erroff=E_STATIC_UNUSED
-LINTTAGS	+= -erroff=E_PTRDIFF_OVERFLOW
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-type-limits
 CERRWARN	+= $(CNOWARN_UNINIT)
@@ -107,12 +90,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 #
diff --git a/usr/src/uts/sun4v/io/px/px_err.c b/usr/src/uts/sun4v/io/px/px_err.c
index e99ca6b882..3bdd99aaf6 100644
--- a/usr/src/uts/sun4v/io/px/px_err.c
+++ b/usr/src/uts/sun4v/io/px/px_err.c
@@ -151,7 +151,7 @@ px_err_fill_pfd(dev_info_t *dip, pf_data_t *pfd_p, px_rc_err_t *epkt) {
 	case BLOCK_MMU:
 		/* Only PIO Fault Addresses are valid, this is DMA */
 		s_status = PCI_STAT_S_TARG_AB;
-		fault_addr = NULL;
+		fault_addr = 0;
 
 		if (epkt->rc_descr.H) {
 			fault_bdf = (pcie_req_id_t)(epkt->hdr[0] >> 16);
@@ -836,7 +836,7 @@ px_mmu_handle_lookup(dev_info_t *dip, ddi_fm_error_t *derr, px_rc_err_t *epkt)
 	pcie_req_id_t bdf = PCIE_INVALID_BDF;
 
 	if (epkt->rc_descr.H) {
-		bdf = (uint32_t)((epkt->hdr[0] >> 16) && 0xFFFF);
+		bdf = (uint32_t)((epkt->hdr[0] >> 16) & 0xFFFF);
 	}
 
 	return (pf_hdl_lookup(dip, derr->fme_ena, PF_ADDR_DMA, addr,
diff --git a/usr/src/uts/sun4v/io/px/px_lib4v.c b/usr/src/uts/sun4v/io/px/px_lib4v.c
index 54bcd03bef..710379950c 100644
--- a/usr/src/uts/sun4v/io/px/px_lib4v.c
+++ b/usr/src/uts/sun4v/io/px/px_lib4v.c
@@ -1686,7 +1686,7 @@ px_lib_log_safeacc_err(px_t *px_p, ddi_acc_handle_t handle, int fme_flag,
 		}
 	}
 
-	(void) px_rp_en_q(px_p, bdf, addr, NULL);
+	(void) px_rp_en_q(px_p, bdf, addr, 0);
 	(void) px_scan_fabric(px_p, px_p->px_dip, &derr);
 	px_fm_exit(px_p);
 }
diff --git a/usr/src/uts/sun4v/io/px/px_tools_4v.c b/usr/src/uts/sun4v/io/px/px_tools_4v.c
index 42ec37636b..288fa61e10 100644
--- a/usr/src/uts/sun4v/io/px/px_tools_4v.c
+++ b/usr/src/uts/sun4v/io/px/px_tools_4v.c
@@ -184,7 +184,7 @@ pxtool_phys_access(px_t *px_p, uintptr_t dev_addr,
 		from_addr = dev_addr;
 	}
 
-	rval = hv_hpriv((void *)pfunc, from_addr, to_addr, NULL);
+	rval = hv_hpriv((void *)pfunc, from_addr, to_addr, 0);
 	switch (rval) {
 	case H_ENOACCESS:	/* Returned by non-debug hypervisor. */
 		rval = ENOTSUP;
diff --git a/usr/src/uts/sun4v/px/Makefile b/usr/src/uts/sun4v/px/Makefile
index d3b224707a..c63335e3b0 100644
--- a/usr/src/uts/sun4v/px/Makefile
+++ b/usr/src/uts/sun4v/px/Makefile
@@ -37,7 +37,6 @@ UTSBASE	= ../..
 #
 MODULE		= px
 OBJECTS		= $(PX_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(PX_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 
 #
@@ -55,7 +54,6 @@ CLEANFILES	+= $(MODSTUBS_O)
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 #
@@ -64,27 +62,10 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 INC_PATH	+= -I$(UTSBASE)/sun4/io/px
 
 #
-# lint pass one enforcement
-#
-CFLAGS += $(CCVERBOSE)
-
-#
 # Turn on doubleword alignment for 64 bit registers
 #
 CFLAGS += -dalign
 
-#
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
-# Please do not carry these forward to new Makefiles.
-#
-LINTTAGS	+= -erroff=E_SUSPICIOUS_COMPARISON
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-LINTTAGS	+= -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
-LINTTAGS	+= -erroff=E_STATIC_UNUSED
-LINTTAGS	+= -erroff=E_PTRDIFF_OVERFLOW
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-type-limits
 CERRWARN	+= -_gcc=-Wno-clobbered
@@ -109,12 +90,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 #