[illumos-gate merge]

commit bad5e46855e02a281fd72c9a6472d9ae98c108dd
    10656 stmf: NULL pointer errors
commit fe7a23c8cdda2a463e51ac6f8353d143e4712ed5
    10690 uts/i86pc Makefile lint cleanup
commit 69914347387da227b7bfdf2a3bcb7189eb65eb74
    10641 rpcib: NULL pointer errors
commit 2178a880dce2da30d0f5a1ac2913eadd93e9c2ae
    10655 emul64: NULL pointer errors
commit 280798bab7492ab1628d72247ebe1872218d98b3
    10648 sysevent: NULL pointer errors
commit 9173eaeb84f6d29cb141ae3814a0a2f07b550763
    10652 tl: NULL pointer errors
commit e2c63ca6b3eb22629464788e745718be5cd878f0
    10651 tnf: NULL pointer errors
commit 1adf40f76cd8af7d925c77df418fff242965788a
    10647 st: NULL pointer errors
commit a4ccb493d6d57fefdf4995850d469f16451094dd
    10645 sy: NULL pointer errors
commit eae92bf6733b3ea3e31cbc60517fcd64f892fa99
    10559 usbms: cast between incompatible function types
commit 52f239a1780ee9936c3b43f0457f14f6eec8dea0
    10644 smp: NULL pointer errors
commit 83dba8e170d701b48549af39323874fe1d568f53
    10643 si3124: NULL pointer errors
commit a465bc80d32c819bfe5742c9aa8c4d706acbae1c
    10642 sgen: NULL pointer errors
commit 9feac2f7d94573c632975afac346c6010e6e65cf
    10640 signalfd: NULL pointer errors
commit 3deeb0a9324c13756f519d91f000f0f44058e7b9
    10436 eventfd: NULL pointer errors
commit 035c26580da74cc57d63b4f030f66f43cb965ffa
    10639 sad: NULL pointer errors
commit d29664394211e1fda0745b84613d450e0eaad798
    10636 rsm: NULL pointer errors
commit 3e2cb4848b2c2c2e9311650d86c7e37e82a245f4
    10635 ramdisk: NULL pointer errors
commit f3c2bd96962f436196993cc8e20e67f8eb9cb129
    10633 ptsl: NULL pointer errors
commit 9ab96e7c5e157cd06e9c6c36124f761311ccf0d1
    10631 ptc: NULL pointer errors
commit 4ff62ce99af7972ca3611aadd6a851b45f2cffcc
    10630 poll: NULL pointer errors
commit f6c5b04580afc6ac84253f5606169ea6e5920526
    10627 pcic: NULL pointer errors
commit 126267c556613df638068ad0939912e6cb0bd21e
    10626 nv_sata: NULL pointer errors
commit 21922c7548dfdabb89cea426ea8f693c37391815
    10624 pcieb: NULL pointer errors
commit 97ac1f6486eb9b87b187039bec20569f99135a8d
    10613 mr_sas: NULL pointer errors

	Conflicts:
	usr/src/uts/i86pc/Makefile.rules

73 files changed, 543 insertions, 1354 deletions

diff --git a/usr/src/uts/common/io/comstar/stmf/stmf.c b/usr/src/uts/common/io/comstar/stmf/stmf.c
index a209f291e3..a79a27e8b3 100644
--- a/usr/src/uts/common/io/comstar/stmf/stmf.c
+++ b/usr/src/uts/common/io/comstar/stmf/stmf.c
@@ -470,7 +470,7 @@ stmf_close(dev_t dev, int flag, int otype, cred_t *credp)
 
 int
 stmf_copyin_iocdata(intptr_t data, int mode, stmf_iocdata_t **iocd,
-						void **ibuf, void **obuf)
+    void **ibuf, void **obuf)
 {
 	int ret;
 
@@ -529,7 +529,7 @@ stmf_copyout_iocdata(intptr_t data, int mode, stmf_iocdata_t *iocd, void *obuf)
 /* ARGSUSED */
 static int
 stmf_ioctl(dev_t dev, int cmd, intptr_t data, int mode,
-	cred_t *credp, int *rval)
+    cred_t *credp, int *rval)
 {
 	stmf_iocdata_t *iocd;
 	void *ibuf = NULL, *obuf = NULL;
@@ -690,9 +690,9 @@ stmf_ioctl(dev_t dev, int cmd, intptr_t data, int mode,
 			if (iss->iss_ss->ss_rport_alias) {
 				(void) strncpy(iss_list[i].alias,
 				    iss->iss_ss->ss_rport_alias, 255);
-				iss_list[i].alias[255] = 0;
+				iss_list[i].alias[255] = '\0';
 			} else {
-				iss_list[i].alias[0] = 0;
+				iss_list[i].alias[0] = '\0';
 			}
 			iss = iss->iss_next;
 		}
@@ -723,13 +723,13 @@ stmf_ioctl(dev_t dev, int cmd, intptr_t data, int mode,
 		lup->lu_present = 1; /* XXX */
 		(void) strncpy(lup->lu_provider_name,
 		    ilu->ilu_lu->lu_lp->lp_name, 255);
-		lup->lu_provider_name[254] = 0;
+		lup->lu_provider_name[254] = '\0';
 		if (ilu->ilu_lu->lu_alias) {
 			(void) strncpy(lup->lu_alias,
 			    ilu->ilu_lu->lu_alias, 255);
-			lup->lu_alias[255] = 0;
+			lup->lu_alias[255] = '\0';
 		} else {
-			lup->lu_alias[0] = 0;
+			lup->lu_alias[0] = '\0';
 		}
 		mutex_exit(&stmf_state.stmf_lock);
 		break;
@@ -764,13 +764,13 @@ stmf_ioctl(dev_t dev, int cmd, intptr_t data, int mode,
 		lportp->tgt_present = 1; /* XXX */
 		(void) strncpy(lportp->tgt_provider_name,
 		    ilport->ilport_lport->lport_pp->pp_name, 255);
-		lportp->tgt_provider_name[254] = 0;
+		lportp->tgt_provider_name[254] = '\0';
 		if (ilport->ilport_lport->lport_alias) {
 			(void) strncpy(lportp->tgt_alias,
 			    ilport->ilport_lport->lport_alias, 255);
-			lportp->tgt_alias[255] = 0;
+			lportp->tgt_alias[255] = '\0';
 		} else {
-			lportp->tgt_alias[0] = 0;
+			lportp->tgt_alias[0] = '\0';
 		}
 		mutex_exit(&stmf_state.stmf_lock);
 		break;
@@ -1352,7 +1352,7 @@ stmf_ioctl(dev_t dev, int cmd, intptr_t data, int mode,
 
 	case STMF_IOCTL_ADD_TRACE:
 		if (iocd->stmf_ibuf_size && ibuf) {
-			((uint8_t *)ibuf)[iocd->stmf_ibuf_size - 1] = 0;
+			((uint8_t *)ibuf)[iocd->stmf_ibuf_size - 1] = '\0';
 			stmf_trace("\nstradm", "%s\n", ibuf);
 		}
 		break;
@@ -2898,7 +2898,7 @@ stmf_create_kstat_lport(stmf_i_local_port_t *ilport)
 	len = ilport->ilport_lport->lport_id->ident_length;
 	bcopy(ilport->ilport_lport->lport_id->ident,
 	    ilport->ilport_kstat_tgt_name, len);
-	ilport->ilport_kstat_tgt_name[len + 1] = NULL;
+	ilport->ilport_kstat_tgt_name[len + 1] = '\0';
 	kstat_named_setstr(&ks_tgt->i_tgt_name,
 	    (const char *)ilport->ilport_kstat_tgt_name);
 	kstat_named_setstr(&ks_tgt->i_tgt_alias,
@@ -4011,7 +4011,7 @@ stmf_handle_to_buf(scsi_task_t *task, uint8_t h)
 /* ARGSUSED */
 struct scsi_task *
 stmf_task_alloc(struct stmf_local_port *lport, stmf_scsi_session_t *ss,
-			uint8_t *lun, uint16_t cdb_length_in, uint16_t ext_id)
+    uint8_t *lun, uint16_t cdb_length_in, uint16_t ext_id)
 {
 	stmf_lu_t *lu;
 	stmf_i_scsi_session_t *iss;
@@ -5499,7 +5499,7 @@ stmf_ctl_lock_exit:;
 /* ARGSUSED */
 stmf_status_t
 stmf_info_impl(uint32_t cmd, void *arg1, void *arg2, uint8_t *buf,
-						uint32_t *bufsizep)
+    uint32_t *bufsizep)
 {
 	return (STMF_NOT_SUPPORTED);
 }
@@ -5507,7 +5507,7 @@ stmf_info_impl(uint32_t cmd, void *arg1, void *arg2, uint8_t *buf,
 /* ARGSUSED */
 stmf_status_t
 stmf_info(uint32_t cmd, void *arg1, void *arg2, uint8_t *buf,
-						uint32_t *bufsizep)
+    uint32_t *bufsizep)
 {
 	uint32_t cl = SI_GET_CLASS(cmd);
 
@@ -7123,7 +7123,7 @@ stmf_generate_lu_event(stmf_i_lu_t *ilu, int eventid, void *arg, uint32_t flags)
 
 void
 stmf_generate_lport_event(stmf_i_local_port_t *ilport, int eventid, void *arg,
-				uint32_t flags)
+    uint32_t flags)
 {
 	if (STMF_EVENT_ENABLED(ilport->ilport_event_hdl, eventid) &&
 	    (ilport->ilport_lport->lport_event_handler != NULL)) {
@@ -7620,7 +7620,7 @@ stmf_trace(caddr_t ident, const char *fmt, ...)
 		len = 158;
 	}
 	tbuf[len++] = '\n';
-	tbuf[len] = 0;
+	tbuf[len] = '\0';
 
 	mutex_enter(&trace_buf_lock);
 	bcopy(tbuf, &stmf_trace_buf[trace_buf_curndx], len+1);
@@ -7638,7 +7638,7 @@ stmf_trace_clear()
 	mutex_enter(&trace_buf_lock);
 	trace_buf_curndx = 0;
 	if (trace_buf_size > 0)
-		stmf_trace_buf[0] = 0;
+		stmf_trace_buf[0] = '\0';
 	mutex_exit(&trace_buf_lock);
 }
 
@@ -7720,7 +7720,7 @@ stmf_base16_str_to_binary(char *c, int dplen, uint8_t *dp)
 
 boolean_t
 stmf_scsilib_tptid_validate(scsi_transport_id_t *tptid, uint32_t total_sz,
-				uint16_t *tptid_sz)
+    uint16_t *tptid_sz)
 {
 	uint16_t tpd_len = SCSI_TPTID_SIZE;
 
@@ -7802,8 +7802,7 @@ stmf_scsilib_tptid_validate(scsi_transport_id_t *tptid, uint32_t total_sz,
 }
 
 boolean_t
-stmf_scsilib_tptid_compare(scsi_transport_id_t *tpd1,
-				scsi_transport_id_t *tpd2)
+stmf_scsilib_tptid_compare(scsi_transport_id_t *tpd1, scsi_transport_id_t *tpd2)
 {
 	if ((tpd1->protocol_id != tpd2->protocol_id) ||
 	    (tpd1->format_code != tpd2->format_code))
@@ -7967,7 +7966,8 @@ devid_to_remote_port_fail:
 }
 
 stmf_remote_port_t *
-stmf_remote_port_alloc(uint16_t tptid_sz) {
+stmf_remote_port_alloc(uint16_t tptid_sz)
+{
 	stmf_remote_port_t *rpt;
 	rpt = (stmf_remote_port_t *)kmem_zalloc(
 	    sizeof (stmf_remote_port_t) + tptid_sz, KM_SLEEP);
diff --git a/usr/src/uts/common/io/devpoll.c b/usr/src/uts/common/io/devpoll.c
index e11ab34142..7368c9b43d 100644
--- a/usr/src/uts/common/io/devpoll.c
+++ b/usr/src/uts/common/io/devpoll.c
@@ -192,7 +192,7 @@ _info(struct modinfo *modinfop)
 static int
 dpattach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 {
-	if (ddi_create_minor_node(devi, "poll", S_IFCHR, 0, DDI_PSEUDO, NULL)
+	if (ddi_create_minor_node(devi, "poll", S_IFCHR, 0, DDI_PSEUDO, 0)
 	    == DDI_FAILURE) {
 		ddi_remove_minor_node(devi, NULL);
 		return (DDI_FAILURE);
diff --git a/usr/src/uts/common/io/emul64.c b/usr/src/uts/common/io/emul64.c
index 47383c619b..f0641ab7ba 100644
--- a/usr/src/uts/common/io/emul64.c
+++ b/usr/src/uts/common/io/emul64.c
@@ -58,8 +58,7 @@ static int emul64_cdb_debug	= 0;
 /*
  * cb_ops function prototypes
  */
-static int emul64_ioctl(dev_t, int cmd, intptr_t arg, int mode,
-			cred_t *credp, int *rvalp);
+static int emul64_ioctl(dev_t, int, intptr_t, int, cred_t *, int *);
 
 /*
  * dev_ops functions prototypes
@@ -87,7 +86,7 @@ static struct scsi_pkt *emul64_scsi_init_pkt(struct scsi_address *ap,
     struct scsi_pkt *pkt, struct buf *bp, int cmdlen, int statuslen,
     int tgtlen, int flags, int (*callback)(), caddr_t arg);
 static void emul64_scsi_destroy_pkt(struct scsi_address *ap,
-					struct scsi_pkt *pkt);
+    struct scsi_pkt *pkt);
 static void emul64_scsi_dmafree(struct scsi_address *ap, struct scsi_pkt *pkt);
 static void emul64_scsi_sync_pkt(struct scsi_address *ap, struct scsi_pkt *pkt);
 static int emul64_scsi_reset_notify(struct scsi_address *ap, int flag,
@@ -99,29 +98,23 @@ static int emul64_scsi_reset_notify(struct scsi_address *ap, int flag,
 static void emul64_i_initcap(struct emul64 *emul64);
 
 static void emul64_i_log(struct emul64 *emul64, int level, char *fmt, ...);
-static int emul64_get_tgtrange(struct emul64 *,
-				intptr_t,
-				emul64_tgt_t **,
-				emul64_tgt_range_t *);
-static int emul64_write_off(struct emul64 *,
-			    emul64_tgt_t *,
-			    emul64_tgt_range_t *);
-static int emul64_write_on(struct emul64 *,
-				emul64_tgt_t *,
-				emul64_tgt_range_t *);
+static int emul64_get_tgtrange(struct emul64 *, intptr_t, emul64_tgt_t **,
+    emul64_tgt_range_t *);
+static int emul64_write_off(struct emul64 *, emul64_tgt_t *,
+    emul64_tgt_range_t *);
+static int emul64_write_on(struct emul64 *, emul64_tgt_t *,
+    emul64_tgt_range_t *);
 static emul64_nowrite_t *emul64_nowrite_alloc(emul64_range_t *);
 static void emul64_nowrite_free(emul64_nowrite_t *);
 static emul64_nowrite_t *emul64_find_nowrite(emul64_tgt_t *,
-					diskaddr_t start_block,
-					size_t blkcnt,
-					emul64_rng_overlap_t *overlapp,
-					emul64_nowrite_t ***prevp);
+    diskaddr_t start_block, size_t blkcnt, emul64_rng_overlap_t *overlapp,
+    emul64_nowrite_t ***prevp);
 
 extern emul64_tgt_t *find_tgt(struct emul64 *, ushort_t, ushort_t);
 
 #ifdef EMUL64DEBUG
 static void emul64_debug_dump_cdb(struct scsi_address *ap,
-		struct scsi_pkt *pkt);
+    struct scsi_pkt *pkt);
 #endif
 
 
@@ -391,7 +384,7 @@ emul64_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
 	tran->tran_destroy_pkt		= emul64_scsi_destroy_pkt;
 	tran->tran_dmafree		= emul64_scsi_dmafree;
 	tran->tran_sync_pkt		= emul64_scsi_sync_pkt;
-	tran->tran_reset_notify 	= emul64_scsi_reset_notify;
+	tran->tran_reset_notify		= emul64_scsi_reset_notify;
 
 	tmp_dma_attr.dma_attr_minxfer = 0x1;
 	tmp_dma_attr.dma_attr_burstsizes = 0x7f;
@@ -516,7 +509,7 @@ emul64_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
 /*ARGSUSED*/
 static int
 emul64_tran_tgt_init(dev_info_t *hba_dip, dev_info_t *tgt_dip,
-	scsi_hba_tran_t *tran, struct scsi_device *sd)
+    scsi_hba_tran_t *tran, struct scsi_device *sd)
 {
 	struct emul64	*emul64;
 	emul64_tgt_t	*tgt;
@@ -807,8 +800,8 @@ emul64_scsi_setcap(struct scsi_address *ap, char *cap, int value, int whom)
 /* ARGSUSED */
 static struct scsi_pkt *
 emul64_scsi_init_pkt(struct scsi_address *ap, struct scsi_pkt *pkt,
-	struct buf *bp, int cmdlen, int statuslen, int tgtlen,
-	int flags, int (*callback)(), caddr_t arg)
+    struct buf *bp, int cmdlen, int statuslen, int tgtlen,
+    int flags, int (*callback)(), caddr_t arg)
 {
 	struct emul64		*emul64	= ADDR2EMUL64(ap);
 	struct emul64_cmd	*sp;
@@ -938,7 +931,7 @@ emul64_scsi_sync_pkt(struct scsi_address *ap, struct scsi_pkt *pkt)
  */
 static int
 emul64_scsi_reset_notify(struct scsi_address *ap, int flag,
-void (*callback)(caddr_t), caddr_t arg)
+    void (*callback)(caddr_t), caddr_t arg)
 {
 	struct emul64				*emul64 = ADDR2EMUL64(ap);
 	struct emul64_reset_notify_entry	*p, *beforep;
@@ -1151,7 +1144,7 @@ emul64_error_inject_req(struct emul64 *emul64, intptr_t arg)
 	struct emul64_error_inj_data error_inj_req;
 
 	/* Check args */
-	if (arg == NULL) {
+	if (arg == (intptr_t)NULL) {
 		return (EINVAL);
 	}
 
@@ -1368,10 +1361,8 @@ emul64_scsi_reset(struct scsi_address *ap, int level)
 }
 
 static int
-emul64_get_tgtrange(struct emul64 *emul64,
-		    intptr_t arg,
-		    emul64_tgt_t **tgtp,
-		    emul64_tgt_range_t *tgtr)
+emul64_get_tgtrange(struct emul64 *emul64, intptr_t arg, emul64_tgt_t **tgtp,
+    emul64_tgt_range_t *tgtr)
 {
 	if (ddi_copyin((void *)arg, tgtr, sizeof (*tgtr), 0) != 0) {
 		cmn_err(CE_WARN, "emul64: ioctl - copy in failed\n");
@@ -1390,12 +1381,8 @@ emul64_get_tgtrange(struct emul64 *emul64,
 }
 
 static int
-emul64_ioctl(dev_t dev,
-	int cmd,
-	intptr_t arg,
-	int mode,
-	cred_t *credp,
-	int *rvalp)
+emul64_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp,
+    int *rvalp)
 {
 	struct emul64		*emul64;
 	int			instance;
@@ -1444,9 +1431,8 @@ emul64_ioctl(dev_t dev,
 
 /* ARGSUSED */
 static int
-emul64_write_off(struct emul64 *emul64,
-	emul64_tgt_t *tgt,
-	emul64_tgt_range_t *tgtr)
+emul64_write_off(struct emul64 *emul64, emul64_tgt_t *tgt,
+    emul64_tgt_range_t *tgtr)
 {
 	size_t			blkcnt = tgtr->emul64_blkrange.emul64_blkcnt;
 	emul64_nowrite_t	*cur;
@@ -1487,9 +1473,8 @@ emul64_write_off(struct emul64 *emul64,
 
 /* ARGSUSED */
 static int
-emul64_write_on(struct emul64 *emul64,
-		emul64_tgt_t *tgt,
-		emul64_tgt_range_t *tgtr)
+emul64_write_on(struct emul64 *emul64, emul64_tgt_t *tgt,
+    emul64_tgt_range_t *tgtr)
 {
 	size_t			blkcnt = tgtr->emul64_blkrange.emul64_blkcnt;
 	emul64_nowrite_t	*cur;
@@ -1534,11 +1519,8 @@ emul64_write_on(struct emul64 *emul64,
 }
 
 static emul64_nowrite_t *
-emul64_find_nowrite(emul64_tgt_t *tgt,
-		    diskaddr_t sb,
-		    size_t blkcnt,
-		    emul64_rng_overlap_t *overlap,
-		    emul64_nowrite_t ***prevp)
+emul64_find_nowrite(emul64_tgt_t *tgt, diskaddr_t sb, size_t blkcnt,
+    emul64_rng_overlap_t *overlap, emul64_nowrite_t ***prevp)
 {
 	emul64_nowrite_t	*cur;
 	emul64_nowrite_t	**prev;
@@ -1625,7 +1607,7 @@ emul64_debug_dump_cdb(struct scsi_address *ap, struct scsi_pkt *pkt)
 	struct emul64	*emul64	= ADDR2EMUL64(ap);
 	struct emul64_cmd	*sp	= PKT2CMD(pkt);
 	uint8_t		*cdb	= pkt->pkt_cdbp;
-	char		buf [256];
+	char		buf[256];
 	char		*p;
 	int		i;
 
@@ -1644,7 +1626,7 @@ emul64_debug_dump_cdb(struct scsi_address *ap, struct scsi_pkt *pkt)
 	}
 	*p++ = ']';
 	*p++ = '\n';
-	*p = 0;
+	*p = '\0';
 
 	cmn_err(CE_CONT, buf);
 }
diff --git a/usr/src/uts/common/io/eventfd.c b/usr/src/uts/common/io/eventfd.c
index e26cdfc78f..efc1f9233f 100644
--- a/usr/src/uts/common/io/eventfd.c
+++ b/usr/src/uts/common/io/eventfd.c
@@ -69,7 +69,7 @@ eventfd_open(dev_t *devp, int flag, int otyp, cred_t *cred_p)
 	if (ddi_soft_state_zalloc(eventfd_softstate, minor) != DDI_SUCCESS) {
 		vmem_free(eventfd_minor, (void *)(uintptr_t)minor, 1);
 		mutex_exit(&eventfd_lock);
-		return (NULL);
+		return (ENXIO);
 	}
 
 	state = ddi_get_soft_state(eventfd_softstate, minor);
@@ -361,7 +361,7 @@ eventfd_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	}
 
 	if (ddi_create_minor_node(devi, "eventfd", S_IFCHR,
-	    EVENTFDMNRN_EVENTFD, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+	    EVENTFDMNRN_EVENTFD, DDI_PSEUDO, 0) == DDI_FAILURE) {
 		cmn_err(CE_NOTE, "/dev/eventfd couldn't create minor node");
 		ddi_soft_state_fini(&eventfd_softstate);
 		mutex_exit(&eventfd_lock);
diff --git a/usr/src/uts/common/io/gentty.c b/usr/src/uts/common/io/gentty.c
index 91fff60b36..4b897d1e4e 100644
--- a/usr/src/uts/common/io/gentty.c
+++ b/usr/src/uts/common/io/gentty.c
@@ -25,7 +25,7 @@
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
+/*	  All Rights Reserved	*/
 
 
 					/* from S5R4 1.22 */
@@ -78,7 +78,7 @@ struct cb_ops	sy_cb_ops = {
 	syioctl,		/* ioctl */
 	nodev,			/* devmap */
 	nodev,			/* mmap */
-	nodev, 			/* segmap */
+	nodev,			/* segmap */
 	sypoll,			/* poll */
 	ddi_prop_op,		/* cb_prop_op */
 	0,			/* streamtab  */
@@ -150,7 +150,7 @@ static int
 sy_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 {
 	if (ddi_create_minor_node(devi, "tty", S_IFCHR,
-	    0, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+	    0, DDI_PSEUDO, 0) == DDI_FAILURE) {
 		ddi_remove_minor_node(devi, NULL);
 		return (-1);
 	}
@@ -301,7 +301,7 @@ sywrite(dev_t dev, struct uio *uiop, struct cred *cr)
 /* ARGSUSED */
 int
 syioctl(dev_t dev, int cmd, intptr_t arg, int mode, struct cred *cr,
-	int *rvalp)
+    int *rvalp)
 {
 	sess_t	*sp;
 	int	error;
@@ -337,7 +337,7 @@ syioctl(dev_t dev, int cmd, intptr_t arg, int mode, struct cred *cr,
 /* ARGSUSED */
 int
 sypoll(dev_t dev, short events, int anyyet, short *reventsp,
-	struct pollhead **phpp)
+    struct pollhead **phpp)
 {
 	sess_t  *sp;
 	int	error;
diff --git a/usr/src/uts/common/io/mr_sas/mr_sas.c b/usr/src/uts/common/io/mr_sas/mr_sas.c
index fba65e5e07..0d23464dec 100644
--- a/usr/src/uts/common/io/mr_sas/mr_sas.c
+++ b/usr/src/uts/common/io/mr_sas/mr_sas.c
@@ -4214,7 +4214,7 @@ service_mfi_aen(struct mrsas_instance *instance, struct mrsas_cmd *cmd)
 				    (uint8_t)~MRDRV_TGT_VALID;
 				mutex_exit(&instance->config_dev_mtx);
 				rval = mrsas_service_evt(instance, tgt, 0,
-				    MRSAS_EVT_UNCONFIG_TGT, NULL);
+				    MRSAS_EVT_UNCONFIG_TGT, 0);
 				con_log(CL_ANN1, (CE_WARN,
 				    "mr_sas: CFG CLEARED AEN rval = %d "
 				    "tgt id = %d", rval, tgt));
@@ -4230,7 +4230,7 @@ service_mfi_aen(struct mrsas_instance *instance, struct mrsas_cmd *cmd)
 		mutex_exit(&instance->config_dev_mtx);
 		rval = mrsas_service_evt(instance,
 		    ddi_get16(acc_handle, &evt_detail->args.ld.target_id), 0,
-		    MRSAS_EVT_UNCONFIG_TGT, NULL);
+		    MRSAS_EVT_UNCONFIG_TGT, 0);
 		con_log(CL_ANN1, (CE_WARN, "mr_sas: LD DELETED AEN rval = %d "
 		    "tgt id = %d index = %d", rval,
 		    ddi_get16(acc_handle, &evt_detail->args.ld.target_id),
@@ -4241,7 +4241,7 @@ service_mfi_aen(struct mrsas_instance *instance, struct mrsas_cmd *cmd)
 	case MR_EVT_LD_CREATED: {
 		rval = mrsas_service_evt(instance,
 		    ddi_get16(acc_handle, &evt_detail->args.ld.target_id), 0,
-		    MRSAS_EVT_CONFIG_TGT, NULL);
+		    MRSAS_EVT_CONFIG_TGT, 0);
 		con_log(CL_ANN1, (CE_WARN, "mr_sas: LD CREATED AEN rval = %d "
 		    "tgt id = %d index = %d", rval,
 		    ddi_get16(acc_handle, &evt_detail->args.ld.target_id),
@@ -4264,7 +4264,7 @@ service_mfi_aen(struct mrsas_instance *instance, struct mrsas_cmd *cmd)
 			mutex_exit(&instance->config_dev_mtx);
 			rval = mrsas_service_evt(instance, ddi_get16(
 			    acc_handle, &evt_detail->args.pd.device_id),
-			    1, MRSAS_EVT_UNCONFIG_TGT, NULL);
+			    1, MRSAS_EVT_UNCONFIG_TGT, 0);
 			con_log(CL_ANN1, (CE_WARN, "mr_sas: PD_REMOVED:"
 			    "rval = %d tgt id = %d ", rval,
 			    ddi_get16(acc_handle,
@@ -4278,7 +4278,7 @@ service_mfi_aen(struct mrsas_instance *instance, struct mrsas_cmd *cmd)
 			rval = mrsas_service_evt(instance,
 			    ddi_get16(acc_handle,
 			    &evt_detail->args.pd.device_id),
-			    1, MRSAS_EVT_CONFIG_TGT, NULL);
+			    1, MRSAS_EVT_CONFIG_TGT, 0);
 			con_log(CL_ANN1, (CE_WARN, "mr_sas: PD_INSERTEDi_EXT:"
 			    "rval = %d tgt id = %d ", rval,
 			    ddi_get16(acc_handle,
@@ -4301,7 +4301,7 @@ service_mfi_aen(struct mrsas_instance *instance, struct mrsas_cmd *cmd)
 				rval = mrsas_service_evt(instance,
 				    ddi_get16(acc_handle,
 				    &evt_detail->args.pd.device_id),
-				    1, MRSAS_EVT_UNCONFIG_TGT, NULL);
+				    1, MRSAS_EVT_UNCONFIG_TGT, 0);
 				con_log(CL_ANN1, (CE_WARN, "mr_sas: PD_REMOVED:"
 				    "rval = %d tgt id = %d ", rval,
 				    ddi_get16(acc_handle,
@@ -4314,7 +4314,7 @@ service_mfi_aen(struct mrsas_instance *instance, struct mrsas_cmd *cmd)
 				rval = mrsas_service_evt(instance,
 				    ddi_get16(acc_handle,
 				    &evt_detail->args.pd.device_id),
-				    1, MRSAS_EVT_CONFIG_TGT, NULL);
+				    1, MRSAS_EVT_CONFIG_TGT, 0);
 				con_log(CL_ANN1, (CE_WARN,
 				    "mr_sas: PD_INSERTED: rval = %d "
 				    " tgt id = %d ", rval,
@@ -7590,7 +7590,7 @@ mrsas_config_ld(struct mrsas_instance *instance, uint16_t tgt,
 		}
 		if (instance->mr_ld_list[tgt].flag != MRDRV_TGT_VALID) {
 			rval = mrsas_service_evt(instance, tgt, 0,
-			    MRSAS_EVT_UNCONFIG_TGT, NULL);
+			    MRSAS_EVT_UNCONFIG_TGT, 0);
 			con_log(CL_ANN1, (CE_WARN,
 			    "mr_sas: DELETING STALE ENTRY rval = %d "
 			    "tgt id = %d ", rval, tgt));
@@ -7833,7 +7833,7 @@ mrsas_mode_sense_build(struct scsi_pkt *pkt)
 	if ((!bp) && bp->b_un.b_addr && bp->b_bcount && acmd->cmd_dmacount) {
 		con_log(CL_ANN1, (CE_WARN, "Failing MODESENSE Command"));
 		/* ADD pkt statistics as Command failed. */
-		return (NULL);
+		return (0);
 	}
 
 	bp_mapin(bp);
@@ -7871,5 +7871,5 @@ mrsas_mode_sense_build(struct scsi_pkt *pkt)
 		default:
 			break;
 	}
-	return (NULL);
+	return (0);
 }
diff --git a/usr/src/uts/common/io/mr_sas/mr_sas_tbolt.c b/usr/src/uts/common/io/mr_sas/mr_sas_tbolt.c
index 0018a13457..68f3020088 100644
--- a/usr/src/uts/common/io/mr_sas/mr_sas_tbolt.c
+++ b/usr/src/uts/common/io/mr_sas/mr_sas_tbolt.c
@@ -3545,7 +3545,7 @@ mrsas_tbolt_config_pd(struct mrsas_instance *instance, uint16_t tgt,
 		}
 		if (instance->mr_tbolt_pd_list[tgt].flag != MRDRV_TGT_VALID) {
 			rval = mrsas_service_evt(instance, tgt, 1,
-			    MRSAS_EVT_UNCONFIG_TGT, NULL);
+			    MRSAS_EVT_UNCONFIG_TGT, 0);
 			con_log(CL_ANN1, (CE_WARN,
 			    "mr_sas:DELETING STALE ENTRY  rval = %d "
 			    "tgt id = %d", rval, tgt));
diff --git a/usr/src/uts/common/io/pcic.c b/usr/src/uts/common/io/pcic.c
index fbc7cf1f1e..bbf9e11f9e 100644
--- a/usr/src/uts/common/io/pcic.c
+++ b/usr/src/uts/common/io/pcic.c
@@ -141,14 +141,14 @@ struct bus_ops pcmciabus_ops = {
 	NULL,				/* (*bus_remove_eventcall)();	*/
 	NULL,				/* (*bus_post_event)();		*/
 	NULL,				/* (*bus_intr_ctl)();		*/
-	NULL,				/* (*bus_config)(); 		*/
-	NULL,				/* (*bus_unconfig)(); 		*/
-	NULL,				/* (*bus_fm_init)(); 		*/
-	NULL,				/* (*bus_fm_fini)(); 		*/
+	NULL,				/* (*bus_config)();		*/
+	NULL,				/* (*bus_unconfig)();		*/
+	NULL,				/* (*bus_fm_init)();		*/
+	NULL,				/* (*bus_fm_fini)();		*/
 	NULL,				/* (*bus_enter)()		*/
 	NULL,				/* (*bus_exit)()		*/
 	NULL,				/* (*bus_power)()		*/
-	pcmcia_intr_ops			/* (*bus_intr_op)(); 		*/
+	pcmcia_intr_ops			/* (*bus_intr_op)();		*/
 };
 
 static struct cb_ops pcic_cbops = {
@@ -2827,7 +2827,7 @@ pcic_set_window(dev_info_t *dip, set_window_t *window)
 				(void) pcmcia_free_mem(memp->res_dip, &res);
 				memp->pcw_status &= ~(PCW_MAPPED|PCW_ENABLED);
 				memp->pcw_hostmem = NULL;
-				memp->pcw_base = NULL;
+				memp->pcw_base = 0;
 				memp->pcw_len = 0;
 			}
 
@@ -2886,7 +2886,7 @@ pcic_set_window(dev_info_t *dip, set_window_t *window)
 				    (window->socket << 16),
 				    (caddr_t *)&memp->pcw_hostmem,
 				    &memp->pcw_handle,
-				    &window->attr, NULL);
+				    &window->attr, 0);
 
 				if (which != DDI_SUCCESS) {
 
@@ -6082,7 +6082,7 @@ pcic_close(dev_t dev, int flag, int otyp, cred_t *cred)
 
 static int
 pcic_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *cred,
-	int *rval)
+    int *rval)
 {
 #ifdef CARDBUS
 	if (cardbus_is_cb_minor(dev))
diff --git a/usr/src/uts/common/io/pciex/pcieb.c b/usr/src/uts/common/io/pciex/pcieb.c
index e01f132156..bdf7a61016 100644
--- a/usr/src/uts/common/io/pciex/pcieb.c
+++ b/usr/src/uts/common/io/pciex/pcieb.c
@@ -114,22 +114,22 @@ static struct bus_ops pcieb_bus_ops = {
 	ndi_busop_remove_eventcall,	/* (*bus_remove_eventcall)();	*/
 	ndi_post_event,			/* (*bus_post_event)();		*/
 	NULL,				/* (*bus_intr_ctl)();		*/
-	NULL,				/* (*bus_config)(); 		*/
-	NULL,				/* (*bus_unconfig)(); 		*/
-	pcieb_fm_init_child,		/* (*bus_fm_init)(); 		*/
-	NULL,				/* (*bus_fm_fini)(); 		*/
-	i_ndi_busop_access_enter,	/* (*bus_fm_access_enter)(); 	*/
-	i_ndi_busop_access_exit,	/* (*bus_fm_access_exit)(); 	*/
-	pcie_bus_power,			/* (*bus_power)(); 	*/
-	pcieb_intr_ops,			/* (*bus_intr_op)(); 		*/
-	pcie_hp_common_ops		/* (*bus_hp_op)(); 		*/
+	NULL,				/* (*bus_config)();		*/
+	NULL,				/* (*bus_unconfig)();		*/
+	pcieb_fm_init_child,		/* (*bus_fm_init)();		*/
+	NULL,				/* (*bus_fm_fini)();		*/
+	i_ndi_busop_access_enter,	/* (*bus_fm_access_enter)();	*/
+	i_ndi_busop_access_exit,	/* (*bus_fm_access_exit)();	*/
+	pcie_bus_power,			/* (*bus_power)();		*/
+	pcieb_intr_ops,			/* (*bus_intr_op)();		*/
+	pcie_hp_common_ops		/* (*bus_hp_op)();		*/
 };
 
 static int	pcieb_open(dev_t *, int, int, cred_t *);
 static int	pcieb_close(dev_t, int, int, cred_t *);
 static int	pcieb_ioctl(dev_t, int, intptr_t, int, cred_t *, int *);
 static int	pcieb_info(dev_info_t *, ddi_info_cmd_t, void *, void **);
-static uint_t 	pcieb_intr_handler(caddr_t arg1, caddr_t arg2);
+static uint_t	pcieb_intr_handler(caddr_t arg1, caddr_t arg2);
 
 /* PM related functions */
 static int	pcieb_pwr_setup(dev_info_t *dip);
@@ -205,7 +205,7 @@ static struct modlinkage modlinkage = {
  * forward function declarations:
  */
 static void	pcieb_uninitchild(dev_info_t *);
-static int 	pcieb_initchild(dev_info_t *child);
+static int	pcieb_initchild(dev_info_t *child);
 static void	pcieb_create_ranges_prop(dev_info_t *, ddi_acc_handle_t);
 static boolean_t pcieb_is_pcie_device_type(dev_info_t *dip);
 
@@ -325,7 +325,7 @@ pcieb_41210_mps_wkrnd(dev_info_t *cdip)
 		}
 
 		/* get sdip's MPS/MRRS to compare to cdip's */
-		sdip_dev_ctrl = PCI_CAP_GET16(cfg_hdl, NULL, cap_ptr,
+		sdip_dev_ctrl = PCI_CAP_GET16(cfg_hdl, 0, cap_ptr,
 		    PCIE_DEVCTL);
 		sdip_mrrs_mps = sdip_dev_ctrl &
 		    (PCIE_DEVCTL_MAX_READ_REQ_MASK |
@@ -344,7 +344,7 @@ pcieb_41210_mps_wkrnd(dev_info_t *cdip)
 			    ~(PCIE_DEVCTL_MAX_READ_REQ_MASK |
 			    PCIE_DEVCTL_MAX_PAYLOAD_MASK)) | cdip_mrrs_mps;
 
-			PCI_CAP_PUT16(cfg_hdl, NULL, cap_ptr, PCIE_DEVCTL,
+			PCI_CAP_PUT16(cfg_hdl, 0, cap_ptr, PCIE_DEVCTL,
 			    sdip_dev_ctrl);
 		}
 
@@ -1166,7 +1166,7 @@ pcieb_intr_init(pcieb_devstate_t *pcieb, int intr_type)
 
 	/* Get the MSI offset for hotplug/PME from the PCIe cap reg */
 	if (intr_type == DDI_INTR_TYPE_MSI) {
-		hp_msi_off = PCI_CAP_GET16(bus_p->bus_cfg_hdl, NULL,
+		hp_msi_off = PCI_CAP_GET16(bus_p->bus_cfg_hdl, 0,
 		    bus_p->bus_pcie_off, PCIE_PCIECAP) &
 		    PCIE_PCIECAP_INT_MSG_NUM;
 
@@ -1196,7 +1196,7 @@ pcieb_intr_init(pcieb_devstate_t *pcieb, int intr_type)
 	if ((intr_type == DDI_INTR_TYPE_MSI) && PCIE_IS_RP(bus_p)) {
 		if (PCIE_HAS_AER(bus_p)) {
 			int aer_msi_off;
-			aer_msi_off = (PCI_XCAP_GET32(bus_p->bus_cfg_hdl, NULL,
+			aer_msi_off = (PCI_XCAP_GET32(bus_p->bus_cfg_hdl, 0,
 			    bus_p->bus_aer_off, PCIE_AER_RE_STS) >>
 			    PCIE_AER_RE_STS_MSG_NUM_SHIFT) &
 			    PCIE_AER_RE_STS_MSG_NUM_MASK;
@@ -1354,7 +1354,7 @@ pcieb_close(dev_t dev, int flags, int otyp, cred_t *credp)
 
 static int
 pcieb_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp,
-	int *rvalp)
+    int *rvalp)
 {
 	int		inst = PCI_MINOR_NUM_TO_INSTANCE(getminor(dev));
 	pcieb_devstate_t	*pcieb = ddi_get_soft_state(pcieb_state, inst);
@@ -1443,8 +1443,8 @@ FAIL:
  */
 static int
 pcieb_dma_allochdl(dev_info_t *dip, dev_info_t *rdip,
-	ddi_dma_attr_t *attr_p, int (*waitfp)(caddr_t), caddr_t arg,
-	ddi_dma_handle_t *handlep)
+    ddi_dma_attr_t *attr_p, int (*waitfp)(caddr_t), caddr_t arg,
+    ddi_dma_handle_t *handlep)
 {
 	int		ret;
 #ifdef	PCIEB_BCM
@@ -1495,8 +1495,8 @@ pcieb_dma_allochdl(dev_info_t *dip, dev_info_t *rdip,
 /*ARGSUSED*/
 static int
 pcieb_dma_mctl(dev_info_t *dip, dev_info_t *rdip, ddi_dma_handle_t handle,
-	enum ddi_dma_ctlops cmd, off_t *offp, size_t *lenp, caddr_t *objp,
-	uint_t cache_flags)
+    enum ddi_dma_ctlops cmd, off_t *offp, size_t *lenp, caddr_t *objp,
+    uint_t cache_flags)
 {
 	int	ret;
 
@@ -1573,7 +1573,7 @@ pcieb_pwr_setup(dev_info_t *dip)
 	 * Save offset to pmcsr for future references.
 	 */
 	pwr_p->pwr_pmcsr_offset = cap_ptr + PCI_PMCSR;
-	pmcap = PCI_CAP_GET16(conf_hdl, NULL, cap_ptr, PCI_PMCAP);
+	pmcap = PCI_CAP_GET16(conf_hdl, 0, cap_ptr, PCI_PMCAP);
 	if (pmcap & PCI_PMCAP_D1) {
 		PCIEB_DEBUG(DBG_PWR, dip, "D1 state supported\n");
 		pwr_p->pwr_pmcaps |= PCIE_SUPPORTS_D1;
@@ -1752,7 +1752,7 @@ pcieb_id_props(pcieb_devstate_t *pcieb)
 #endif	/* PX_PLX */
 	if ((fic == 0) && ((PCI_CAP_LOCATE(config_handle,
 	    PCI_CAP_ID_SLOT_ID, &cap_ptr)) != DDI_FAILURE)) {
-		uint8_t esr = PCI_CAP_GET8(config_handle, NULL,
+		uint8_t esr = PCI_CAP_GET8(config_handle, 0,
 		    cap_ptr, PCI_CAP_ID_REGS_OFF);
 		if (PCI_CAPSLOT_FIC(esr))
 			fic = 1;
@@ -1761,10 +1761,10 @@ pcieb_id_props(pcieb_devstate_t *pcieb)
 	if ((PCI_CAP_LOCATE(config_handle,
 	    PCI_CAP_XCFG_SPC(PCIE_EXT_CAP_ID_SER), &cap_ptr)) != DDI_FAILURE) {
 		/* Serialid can be 0 thru a full 40b number */
-		serialid = PCI_XCAP_GET32(config_handle, NULL,
+		serialid = PCI_XCAP_GET32(config_handle, 0,
 		    cap_ptr, PCIE_SER_SID_UPPER_DW);
 		serialid <<= 32;
-		serialid |= PCI_XCAP_GET32(config_handle, NULL,
+		serialid |= PCI_XCAP_GET32(config_handle, 0,
 		    cap_ptr, PCIE_SER_SID_LOWER_DW);
 	}
 
@@ -1778,7 +1778,7 @@ pcieb_id_props(pcieb_devstate_t *pcieb)
 
 static void
 pcieb_create_ranges_prop(dev_info_t *dip,
-	ddi_acc_handle_t config_handle)
+    ddi_acc_handle_t config_handle)
 {
 	uint32_t base, limit;
 	ppb_ranges_t	ranges[PCIEB_RANGE_LEN];
diff --git a/usr/src/uts/common/io/ramdisk.c b/usr/src/uts/common/io/ramdisk.c
index 78fb849256..a7a568b77c 100644
--- a/usr/src/uts/common/io/ramdisk.c
+++ b/usr/src/uts/common/io/ramdisk.c
@@ -824,7 +824,7 @@ rd_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
 			rsp->rd_dip = dip;
 
 			if (ddi_create_minor_node(dip, RD_CTL_NODE,
-			    S_IFCHR, 0, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+			    S_IFCHR, 0, DDI_PSEUDO, 0) == DDI_FAILURE) {
 				goto attach_failed;
 			}
 		} else {
diff --git a/usr/src/uts/common/io/rsm/rsm.c b/usr/src/uts/common/io/rsm/rsm.c
index 4c5489b039..d9d40c83fd 100644
--- a/usr/src/uts/common/io/rsm/rsm.c
+++ b/usr/src/uts/common/io/rsm/rsm.c
@@ -828,7 +828,7 @@ rsm_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	ASSERT(rnum == RSM_DRIVER_MINOR);
 
 	if (ddi_create_minor_node(devi, DRIVER_NAME, S_IFCHR,
-	    rnum, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+	    rnum, DDI_PSEUDO, 0) == DDI_FAILURE) {
 		DBG_PRINTF((category, RSM_ERR,
 		    "rsm: rsm_attach - unable to allocate "
 		    "minor #\n"));
@@ -2854,7 +2854,7 @@ rsm_publish(rsmseg_t *seg, rsm_ioctlmsg_t *msg, intptr_t dataptr, int mode)
 	rsm_access_entry_t	*rsmpi_acl;
 	rsm_memory_local_t	mem;
 	struct buf		*xbuf;
-	dev_t 			sdev = 0;
+	dev_t			sdev = 0;
 	adapter_t		*adapter;
 	rsm_memseg_id_t		segment_id = 0;
 	int			loopback_flag = 0;
@@ -2887,7 +2887,7 @@ rsm_publish(rsmseg_t *seg, rsm_ioctlmsg_t *msg, intptr_t dataptr, int mode)
 	/*
 	 * The application provided msg->key is used for resolving a
 	 * segment id according to the following:
-	 *    key = 0   		Kernel Agent selects the segment id
+	 *    key = 0			Kernel Agent selects the segment id
 	 *    key <= RSM_DLPI_ID_END	Reserved for system usage except
 	 *				RSMLIB range
 	 *    key < RSM_USER_APP_ID_BASE segment id = key
@@ -3442,7 +3442,7 @@ static void
 rsm_send_importer_disconnects(rsm_memseg_id_t ex_segid,
     rsm_node_id_t ex_nodeid)
 {
-	rsmipc_request_t 	request;
+	rsmipc_request_t	request;
 	importing_token_t	*prev_token, *token, *tmp_token, *tokp;
 	importing_token_t	*force_disconnect_list = NULL;
 	int			index;
@@ -3694,7 +3694,7 @@ rsm_intr_reply(rsmipc_msghdr_t *msg)
 	 * copy data into reply slot area
 	 * signal waiter
 	 */
-	rsmipc_slot_t 	*slot;
+	rsmipc_slot_t	*slot;
 	rsmipc_cookie_t	*cookie;
 	void *data = (void *) msg;
 	size_t size = sizeof (rsmipc_reply_t);
@@ -5745,7 +5745,7 @@ static void
 rsm_send_suspend()
 {
 	int			i, e;
-	rsmipc_request_t 	request;
+	rsmipc_request_t	request;
 	list_element_t		*tokp;
 	list_element_t		*head = NULL;
 	importing_token_t	*token;
@@ -5834,7 +5834,7 @@ rsm_send_suspend()
 static void
 rsm_send_resume()
 {
-	rsmipc_request_t 	request;
+	rsmipc_request_t	request;
 	list_element_t		*elem, *head;
 
 	/*
@@ -6450,7 +6450,7 @@ rsm_connect(rsmseg_t *seg, rsm_ioctlmsg_t *msg, cred_t *cred,
 		atomic_inc_16(bar_va + seg->s_hdr.rsmrc_num);
 		/* return user off into barrier page where status will be */
 		msg->off = (int)seg->s_hdr.rsmrc_num;
-		msg->gnum = bar_va[msg->off]; 	/* gnum race */
+		msg->gnum = bar_va[msg->off];	/* gnum race */
 	} else {
 		msg->off = 0;
 		msg->gnum = 0;	/* gnum race */
@@ -6765,7 +6765,7 @@ rsm_chpoll(dev_t dev, short events, int anyyet, short *reventsp,
 {
 	minor_t		rnum;
 	rsmresource_t	*res;
-	rsmseg_t 	*seg;
+	rsmseg_t	*seg;
 	DBG_DEFINE(category, RSM_KERNEL_AGENT | RSM_FUNC_ALL | RSM_DDI);
 
 	DBG_PRINTF((category, RSM_DEBUG_VERBOSE, "rsm_chpoll enter\n"));
diff --git a/usr/src/uts/common/io/sad.c b/usr/src/uts/common/io/sad.c
index 2affbbdc19..7dcce74339 100644
--- a/usr/src/uts/common/io/sad.c
+++ b/usr/src/uts/common/io/sad.c
@@ -25,7 +25,7 @@
 
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
+/*	  All Rights Reserved	*/
 
 
 /*
@@ -134,11 +134,11 @@ sad_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 		return (DDI_FAILURE);
 
 	if (ddi_create_minor_node(devi, "user", S_IFCHR,
-	    0, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+	    0, DDI_PSEUDO, 0) == DDI_FAILURE) {
 		return (DDI_FAILURE);
 	}
 	if (ddi_create_minor_node(devi, "admin", S_IFCHR,
-	    1, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+	    1, DDI_PSEUDO, 0) == DDI_FAILURE) {
 		ddi_remove_minor_node(devi, NULL);
 		return (DDI_FAILURE);
 	}
diff --git a/usr/src/uts/common/io/sata/adapters/nv_sata/nv_sata.c b/usr/src/uts/common/io/sata/adapters/nv_sata/nv_sata.c
index fa381ded8f..f5a67b7275 100644
--- a/usr/src/uts/common/io/sata/adapters/nv_sata/nv_sata.c
+++ b/usr/src/uts/common/io/sata/adapters/nv_sata/nv_sata.c
@@ -4060,7 +4060,7 @@ nv_rem_intrs(nv_ctl_t *nvc)
  */
 static void
 nv_vcmn_err(int ce, nv_ctl_t *nvc, nv_port_t *nvp, const char *fmt, va_list ap,
-	boolean_t log_to_sata_ring)
+    boolean_t log_to_sata_ring)
 {
 	char port[NV_STR_LEN];
 	char inst[NV_STR_LEN];
@@ -7141,7 +7141,7 @@ nv_sgp_cleanup(nv_ctl_t *nvc)
 		cb->sgpio_cr0 = SGP_CR0_ENABLE_MASK;
 		(void) nv_sgp_write_data(nvc);
 
-		cb->sgpio_sr = NULL;
+		cb->sgpio_sr = 0;
 
 		/* zero out the CBP to cmn mapping */
 		for (i = 0; i < NV_MAX_CBPS; i++) {
diff --git a/usr/src/uts/common/io/sata/adapters/si3124/si3124.c b/usr/src/uts/common/io/sata/adapters/si3124/si3124.c
index 32df689749..d3ac6753d4 100644
--- a/usr/src/uts/common/io/sata/adapters/si3124/si3124.c
+++ b/usr/src/uts/common/io/sata/adapters/si3124/si3124.c
@@ -31,7 +31,7 @@
 /*
  *
  *
- * 			Few Design notes
+ *			Few Design notes
  *
  *
  * I. General notes
@@ -48,7 +48,7 @@
  * II. Data structures
  *
  * si_ctl_state_t: This holds the driver private information for each
- * 	controller instance. Each of the sata ports within a single
+ *	controller instance. Each of the sata ports within a single
  *	controller are represented by si_port_state_t. The
  *	sictl_global_acc_handle and sictl_global_address map the
  *	controller-wide global register space and are derived from pci
@@ -57,17 +57,17 @@
  *
  * si_port_state_t: This holds the per port information. The siport_mutex
  *	holds the per port mutex. The siport_pending_tags is the bit mask of
- * 	commands posted to controller. The siport_slot_pkts[] holds the
- * 	pending sata packets. The siport_port_type holds the device type
+ *	commands posted to controller. The siport_slot_pkts[] holds the
+ *	pending sata packets. The siport_port_type holds the device type
  *	connected directly to the port while the siport_portmult_state
- * 	holds the similar information for the devices behind a port
+ *	holds the similar information for the devices behind a port
  *	multiplier.
  *
  * si_prb_t: This contains the PRB being posted to the controller.
  *	The two SGE entries contained within si_prb_t itself are not
  *	really used to hold any scatter gather entries. The scatter gather
  *	list is maintained external to PRB and is linked from one
- * 	of the contained SGEs inside the PRB. For atapi devices, the
+ *	of the contained SGEs inside the PRB. For atapi devices, the
  *	first contained SGE holds the PACKET and second contained
  *	SGE holds the link to an external SGT. For non-atapi devices,
  *	the first contained SGE works as link to external SGT while
@@ -95,15 +95,15 @@
  *	respectively.
  *
  * Command completion: On a successful completion, intr_command_complete()
- * 	receives the control. The slot_status register holds the outstanding
+ *	receives the control. The slot_status register holds the outstanding
  *	commands. Any reading of slot_status register automatically clears
  *	the interrupt. By comparing the slot_status register contents with
  *	per port siport_pending_tags, we determine which of the previously
  *	posted commands have finished.
  *
  * Timeout handling: Every 5 seconds, the watchdog handler scans thru the
- * 	pending packets. The satapkt->satapkt_hba_driver_private field is
- * 	overloaded with the count of watchdog cycles a packet has survived.
+ *	pending packets. The satapkt->satapkt_hba_driver_private field is
+ *	overloaded with the count of watchdog cycles a packet has survived.
  *	If a packet has not completed within satapkt->satapkt_time, it is
  *	failed with error code of SATA_PKT_TIMEOUT. There is one watchdog
  *	handler running for each instance of controller.
@@ -111,7 +111,7 @@
  * Error handling: For 3124, whenever any single command has encountered
  *	an error, the whole port execution completely stalls; there is no
  *	way of canceling or aborting the particular failed command. If
- * 	the port is connected to a port multiplier, we can however RESUME
+ *	the port is connected to a port multiplier, we can however RESUME
  *	other non-error devices connected to the port multiplier.
  *	The only way to recover the failed commands is to either initialize
  *	the port or reset the port/device. Both port initialize and reset
@@ -134,7 +134,7 @@
  *		a Port Initialize.
  *
  *	  b) for SDBERROR: [SDBERROR means failed command is an NCQ command]
- * 		Handle exactly like DEVICEERROR handling.
+ *		Handle exactly like DEVICEERROR handling.
  *		After the Port Initialize done, do a Read Log Extended.
  *
  *	  c) for SENDFISERROR:
@@ -144,7 +144,7 @@
  *		 3) Perform a Port Initialize
  *
  *		If the port is not connected to port multiplier, issue
- * 		a Device Reset.
+ *		a Device Reset.
  *
  *	  d) for DATAFISERROR:
  *		If the port was executing an NCQ command, issue a Device
@@ -154,7 +154,7 @@
  *
  *	  e) for any other error, simply issue a Device Reset.
  *
- * 	To synchronize the interactions between various control flows (e.g.
+ *	To synchronize the interactions between various control flows (e.g.
  *	error recovery, timeout handling, si_poll_timeout, incoming flow
  *	from framework etc.), the following precautions are taken care of:
  *		a) During mopping_in_progress, no more commands are
@@ -165,7 +165,7 @@
  *		failing (possibly with a different error code)
  *
  * Atapi handling: For atapi devices, we use the first SGE within the PRB
- * 	to fill the scsi cdb while the second SGE points to external SGT.
+ *	to fill the scsi cdb while the second SGE points to external SGT.
  *
  * Queuing: Queue management is achieved external to the driver inside sd.
  *	Based on sata_hba_tran->qdepth and IDENTIFY data, the framework
@@ -189,7 +189,7 @@
  *
  * 1) Currently the atapi packet length is hard coded to 12 bytes
  *	This is wrong. The framework should determine it just like they
- * 	determine ad_cdb_len in legacy atapi.c. It should even reject
+ *	determine ad_cdb_len in legacy atapi.c. It should even reject
  *	init_pkt() for greater CDB lengths. See atapi.c. Revisit this
  *	in 2nd phase of framework project.
  *
@@ -303,10 +303,10 @@ static	void si_enable_port_interrupts(si_ctl_state_t *, int);
 static	void si_enable_all_interrupts(si_ctl_state_t *);
 static	void si_disable_port_interrupts(si_ctl_state_t *, int);
 static	void si_disable_all_interrupts(si_ctl_state_t *);
-static 	void fill_dev_sregisters(si_ctl_state_t *, int, sata_device_t *);
-static 	int si_add_legacy_intrs(si_ctl_state_t *);
-static 	int si_add_msi_intrs(si_ctl_state_t *);
-static 	void si_rem_intrs(si_ctl_state_t *);
+static	void fill_dev_sregisters(si_ctl_state_t *, int, sata_device_t *);
+static	int si_add_legacy_intrs(si_ctl_state_t *);
+static	int si_add_msi_intrs(si_ctl_state_t *);
+static	void si_rem_intrs(si_ctl_state_t *);
 
 static	int si_reset_dport_wait_till_ready(si_ctl_state_t *,
 				si_port_state_t *, int, int);
@@ -1006,9 +1006,7 @@ si_power(dev_info_t *dip, int component, int level)
  *
  */
 static int
-si_getinfo(dev_info_t *dip, ddi_info_cmd_t infocmd,
-		void *arg,
-		void **result)
+si_getinfo(dev_info_t *dip, ddi_info_cmd_t infocmd, void *arg, void **result)
 {
 #ifndef __lock_lint
 	_NOTE(ARGUNUSED(dip))
@@ -1047,7 +1045,7 @@ si_getinfo(dev_info_t *dip, ddi_info_cmd_t infocmd,
 static int
 si_register_sata_hba_tran(si_ctl_state_t *si_ctlp)
 {
-	struct 	sata_hba_tran	*sata_hba_tran;
+	struct	sata_hba_tran	*sata_hba_tran;
 
 	SIDBG_C(SIDBG_ENTRY, si_ctlp,
 	    "si_register_sata_hba_tran entry", NULL);
@@ -1172,7 +1170,7 @@ si_tran_probe_port(dev_info_t *dip, sata_device_t *sd)
 			mutex_exit(&si_portp->siport_mutex);
 			return (SATA_FAILURE);
 		} else {
-			si_portmultp = 	&si_portp->siport_portmult_state;
+			si_portmultp = &si_portp->siport_portmult_state;
 			port_type = si_portmultp->sipm_port_type[pmport];
 		}
 	} else {
@@ -1364,15 +1362,9 @@ si_tran_start(dev_info_t *dip, sata_pkt_t *spkt)
  * WARNING!!! siport_mutex should be acquired before the function is called.
  */
 static void
-si_mop_commands(si_ctl_state_t *si_ctlp,
-		si_port_state_t *si_portp,
-		uint8_t	port,
-
-		uint32_t slot_status,
-		uint32_t failed_tags,
-		uint32_t timedout_tags,
-		uint32_t aborting_tags,
-		uint32_t reset_tags)
+si_mop_commands(si_ctl_state_t *si_ctlp, si_port_state_t *si_portp,
+    uint8_t port, uint32_t slot_status, uint32_t failed_tags,
+    uint32_t timedout_tags, uint32_t aborting_tags, uint32_t reset_tags)
 {
 	uint32_t finished_tags, unfinished_tags;
 	int tmpslot;
@@ -2035,7 +2027,7 @@ si_alloc_sgbpool(si_ctl_state_t *si_ctlp, int port)
 	    NULL,
 	    (caddr_t *)&si_portp->siport_sgbpool,
 	    &ret_len,
-	    &si_portp->siport_sgbpool_acc_handle) != NULL) {
+	    &si_portp->siport_sgbpool_acc_handle) != DDI_SUCCESS) {
 
 		/*  error.. free the dma handle. */
 		ddi_dma_free_handle(&si_portp->siport_sgbpool_dma_handle);
@@ -2114,7 +2106,7 @@ si_alloc_prbpool(si_ctl_state_t *si_ctlp, int port)
 	    NULL,
 	    (caddr_t *)&si_portp->siport_prbpool,
 	    &ret_len,
-	    &si_portp->siport_prbpool_acc_handle) != NULL) {
+	    &si_portp->siport_prbpool_acc_handle) != DDI_SUCCESS) {
 
 		/* error.. free the dma handle. */
 		ddi_dma_free_handle(&si_portp->siport_prbpool_dma_handle);
@@ -2470,7 +2462,7 @@ si_poll_cmd(
 /*
  * Searches for and claims a free slot.
  *
- * Returns: 	SI_FAILURE if no slots found
+ * Returns:	SI_FAILURE if no slots found
  *		claimed slot number if successful
  *
  * WARNING, WARNING: The caller is expected to obtain the siport_mutex
@@ -2594,17 +2586,17 @@ si_deliver_satapkt(
 	case 0:
 		/*
 		 * satacmd_addr_type will be 0 for the commands below:
-		 * 	SATAC_PACKET
-		 * 	SATAC_IDLE_IM
-		 * 	SATAC_STANDBY_IM
-		 * 	SATAC_DOWNLOAD_MICROCODE
-		 * 	SATAC_FLUSH_CACHE
-		 * 	SATAC_SET_FEATURES
-		 * 	SATAC_SMART
-		 * 	SATAC_ID_PACKET_DEVICE
-		 * 	SATAC_ID_DEVICE
-		 * 	SATAC_READ_PORTMULT
-		 * 	SATAC_WRITE_PORTMULT
+		 *	SATAC_PACKET
+		 *	SATAC_IDLE_IM
+		 *	SATAC_STANDBY_IM
+		 *	SATAC_DOWNLOAD_MICROCODE
+		 *	SATAC_FLUSH_CACHE
+		 *	SATAC_SET_FEATURES
+		 *	SATAC_SMART
+		 *	SATAC_ID_PACKET_DEVICE
+		 *	SATAC_ID_DEVICE
+		 *	SATAC_READ_PORTMULT
+		 *	SATAC_WRITE_PORTMULT
 		 */
 		/* FALLTHRU */
 
@@ -3980,9 +3972,9 @@ si_intr_command_error(
 	    port,
 	    slot_status,
 	    failed_tags,
-	    0, 	/* timedout_tags */
-	    0, 	/* aborting_tags */
-	    0); 	/* reset_tags */
+	    0,	/* timedout_tags */
+	    0,	/* aborting_tags */
+	    0);	/* reset_tags */
 
 	ASSERT(si_portp->siport_pending_tags == 0);
 
@@ -5911,7 +5903,7 @@ si_log(si_ctl_state_t *si_ctlp, si_port_state_t *si_portp, char *fmt, ...)
 
 static void
 si_copy_out_regs(sata_cmd_t *scmd, si_ctl_state_t *si_ctlp, uint8_t port,
-	uint8_t slot)
+    uint8_t slot)
 {
 	uint32_t *fis_word_ptr;
 	si_prb_t *prb;
diff --git a/usr/src/uts/common/io/scsi/targets/sgen.c b/usr/src/uts/common/io/scsi/targets/sgen.c
index 866d9df112..1d6316caf3 100644
--- a/usr/src/uts/common/io/scsi/targets/sgen.c
+++ b/usr/src/uts/common/io/scsi/targets/sgen.c
@@ -88,7 +88,7 @@ static char *sgen_devtypes[] = {
 #define	SGEN_VENDID_MAX 8
 #define	SGEN_PRODID_MAX 16
 
-#define	FILL_SCSI1_LUN(devp, pkt) 					\
+#define	FILL_SCSI1_LUN(devp, pkt)					\
 	if ((devp)->sd_inq->inq_ansi == 0x1) {				\
 		int _lun;						\
 		_lun = ddi_prop_get_int(DDI_DEV_T_ANY, (devp)->sd_dev,	\
@@ -254,7 +254,7 @@ _info(struct modinfo *modinfop)
 
 /*
  * sgen_typename()
- * 	return a device type's name by looking it up in the sgen_devtypes table.
+ *	return a device type's name by looking it up in the sgen_devtypes table.
  */
 static char *
 sgen_typename(uchar_t typeno)
@@ -266,8 +266,8 @@ sgen_typename(uchar_t typeno)
 
 /*
  * sgen_typenum()
- * 	return a device type's number by looking it up in the sgen_devtypes
- * 	table.
+ *	return a device type's number by looking it up in the sgen_devtypes
+ *	table.
  */
 static int
 sgen_typenum(const char *typename, uchar_t *typenum)
@@ -284,8 +284,8 @@ sgen_typenum(const char *typename, uchar_t *typenum)
 
 /*
  * sgen_setup_binddb()
- * 	initialize a data structure which stores all of the information about
- * 	which devices and device types the driver should bind to.
+ *	initialize a data structure which stores all of the information about
+ *	which devices and device types the driver should bind to.
  */
 static void
 sgen_setup_binddb(dev_info_t *dip)
@@ -390,7 +390,7 @@ sgen_setup_binddb(dev_info_t *dip)
 
 /*
  * sgen_cleanup_binddb()
- * 	deallocate data structures for binding database.
+ *	deallocate data structures for binding database.
  */
 static void
 sgen_cleanup_binddb()
@@ -424,7 +424,7 @@ sgen_cleanup_binddb()
 
 /*
  * sgen_bind_byinq()
- * 	lookup a device in the binding database by its inquiry data.
+ *	lookup a device in the binding database by its inquiry data.
  */
 static int
 sgen_bind_byinq(dev_info_t *dip)
@@ -471,8 +471,8 @@ sgen_bind_byinq(dev_info_t *dip)
 
 /*
  * sgen_bind_bytype()
- * 	lookup a device type in the binding database; if found, return a
- * 	format string corresponding to the string in the .conf file.
+ *	lookup a device type in the binding database; if found, return a
+ *	format string corresponding to the string in the .conf file.
  */
 static int
 sgen_bind_bytype(dev_info_t *dip)
@@ -493,13 +493,13 @@ sgen_bind_bytype(dev_info_t *dip)
 
 /*
  * sgen_get_binding()
- * 	Check to see if the device in question matches the criteria for
- * 	sgen to bind.
+ *	Check to see if the device in question matches the criteria for
+ *	sgen to bind.
  *
- * 	Either the .conf file must specify a device_type entry which
- * 	matches the SCSI device type of this device, or the inquiry
- * 	string provided by the device must match an inquiry string specified
- * 	in the .conf file.  Inquiry data is matched first.
+ *	Either the .conf file must specify a device_type entry which
+ *	matches the SCSI device type of this device, or the inquiry
+ *	string provided by the device must match an inquiry string specified
+ *	in the .conf file.  Inquiry data is matched first.
  */
 static int
 sgen_get_binding(dev_info_t *dip)
@@ -531,7 +531,7 @@ done:
 
 /*
  * sgen_attach()
- * 	attach(9e) entrypoint.
+ *	attach(9e) entrypoint.
  */
 static int
 sgen_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
@@ -632,7 +632,7 @@ sgen_do_attach(dev_info_t *dip)
 	 * For simplicity, the minor number == the instance number
 	 */
 	if (ddi_create_minor_node(dip, sgen_typename(devtype), S_IFCHR,
-	    instance, DDI_NT_SGEN, NULL) == DDI_FAILURE) {
+	    instance, DDI_NT_SGEN, 0) == DDI_FAILURE) {
 		scsi_unprobe(scsidevp);
 		ddi_prop_remove_all(dip);
 		sgen_log(sg_state, SGEN_DIAG1,
@@ -735,8 +735,8 @@ sgen_do_attach(dev_info_t *dip)
 
 /*
  * sgen_setup_sense()
- * 	Allocate a request sense packet so that if sgen needs to fetch sense
- * 	data for the user, it will have a pkt ready to send.
+ *	Allocate a request sense packet so that if sgen needs to fetch sense
+ *	data for the user, it will have a pkt ready to send.
  */
 static int
 sgen_setup_sense(sgen_state_t *sg_state)
@@ -778,7 +778,7 @@ sgen_setup_sense(sgen_state_t *sg_state)
 
 /*
  * sgen_create_errstats()
- * 	create named kstats for tracking occurrence of errors.
+ *	create named kstats for tracking occurrence of errors.
  */
 static void
 sgen_create_errstats(sgen_state_t *sg_state, int instance)
@@ -824,7 +824,7 @@ sgen_create_errstats(sgen_state_t *sg_state, int instance)
 
 /*
  * sgen_detach()
- * 	detach(9E) entrypoint
+ *	detach(9E) entrypoint
  */
 static int
 sgen_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
@@ -859,7 +859,7 @@ sgen_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
 
 /*
  * sgen_do_detach()
- * 	detach the driver, tearing down resources.
+ *	detach the driver, tearing down resources.
  */
 static int
 sgen_do_detach(dev_info_t *dip)
@@ -923,11 +923,11 @@ sgen_do_detach(dev_info_t *dip)
 
 /*
  * sgen_do_suspend()
- * 	suspend the driver.  This sets the "suspend" bit for this target if it
- * 	is currently open; once resumed, the suspend bit will cause
- * 	subsequent I/Os to fail.  We want user programs to close and
- * 	reopen the device to acknowledge that they need to reexamine its
- * 	state and do the right thing.
+ *	suspend the driver.  This sets the "suspend" bit for this target if it
+ *	is currently open; once resumed, the suspend bit will cause
+ *	subsequent I/Os to fail.  We want user programs to close and
+ *	reopen the device to acknowledge that they need to reexamine its
+ *	state and do the right thing.
  */
 static int
 sgen_do_suspend(dev_info_t *dip)
@@ -992,9 +992,9 @@ sgen_getinfo(dev_info_t *dip, ddi_info_cmd_t infocmd, void *arg, void **result)
 
 /*
  * sgen_probe()
- * 	probe(9e) entrypoint.  sgen *never* returns DDI_PROBE_PARTIAL, in
- * 	order to avoid leaving around extra devinfos.  If sgen's binding
- * 	rules indicate that it should bind, it returns DDI_PROBE_SUCCESS.
+ *	probe(9e) entrypoint.  sgen *never* returns DDI_PROBE_PARTIAL, in
+ *	order to avoid leaving around extra devinfos.  If sgen's binding
+ *	rules indicate that it should bind, it returns DDI_PROBE_SUCCESS.
  */
 static int
 sgen_probe(dev_info_t *dip)
@@ -1046,8 +1046,8 @@ sgen_probe(dev_info_t *dip)
 
 /*
  * sgen_open()
- * 	open(9e) entrypoint.  sgen enforces a strict exclusive open policy per
- * 	target.
+ *	open(9e) entrypoint.  sgen enforces a strict exclusive open policy per
+ *	target.
  */
 /*ARGSUSED1*/
 static int
@@ -1098,7 +1098,7 @@ sgen_open(dev_t *dev_p, int flag, int otyp, cred_t *cred_p)
 
 /*
  * sgen_close()
- * 	close(9e) entrypoint.
+ *	close(9e) entrypoint.
  */
 /*ARGSUSED1*/
 static int
@@ -1128,7 +1128,7 @@ sgen_close(dev_t dev, int flag, int otyp, cred_t *cred_p)
 
 /*
  * sgen_ioctl()
- * 	sgen supports the USCSI(7I) ioctl interface.
+ *	sgen supports the USCSI(7I) ioctl interface.
  */
 /*ARGSUSED4*/
 static int
@@ -1195,7 +1195,7 @@ sgen_ioctl(dev_t dev,
 
 /*
  * sgen_uscsi_cmd()
- * 	Setup, configuration and teardown for a uscsi(7I) command
+ *	Setup, configuration and teardown for a uscsi(7I) command
  */
 /*ARGSUSED*/
 static int
@@ -1298,8 +1298,8 @@ sgen_uscsi_cmd(dev_t dev, struct uscsi_cmd *ucmd, int flag)
 
 /*
  * sgen_hold_cmdbuf()
- * 	Acquire a lock on the command buffer for the given target.  Returns
- * 	non-zero if interrupted.
+ *	Acquire a lock on the command buffer for the given target.  Returns
+ *	non-zero if interrupted.
  */
 static int
 sgen_hold_cmdbuf(sgen_state_t *sg_state)
@@ -1319,7 +1319,7 @@ sgen_hold_cmdbuf(sgen_state_t *sg_state)
 
 /*
  * sgen_rele_cmdbuf()
- * 	release the command buffer for a particular target.
+ *	release the command buffer for a particular target.
  */
 static void
 sgen_rele_cmdbuf(sgen_state_t *sg_state)
@@ -1332,8 +1332,8 @@ sgen_rele_cmdbuf(sgen_state_t *sg_state)
 
 /*
  * sgen_start()
- * 	Transport a uscsi command; this is invoked by physio() or directly
- * 	by sgen_uscsi_cmd().
+ *	Transport a uscsi command; this is invoked by physio() or directly
+ *	by sgen_uscsi_cmd().
  */
 static int
 sgen_start(struct buf *bp)
@@ -1402,8 +1402,8 @@ sgen_start(struct buf *bp)
 
 /*
  * sgen_scsi_transport()
- * 	a simple scsi_transport() wrapper which can be configured to inject
- * 	sporadic errors for testing.
+ *	a simple scsi_transport() wrapper which can be configured to inject
+ *	sporadic errors for testing.
  */
 static int
 sgen_scsi_transport(struct scsi_pkt *pkt)
@@ -1436,7 +1436,7 @@ sgen_scsi_transport(struct scsi_pkt *pkt)
 
 /*
  * sgen_make_uscsi_cmd()
- * 	Initialize a SCSI packet usable for USCSI.
+ *	Initialize a SCSI packet usable for USCSI.
  */
 static int
 sgen_make_uscsi_cmd(sgen_state_t *sg_state, struct buf *bp)
@@ -1523,8 +1523,8 @@ sgen_make_uscsi_cmd(sgen_state_t *sg_state, struct buf *bp)
 
 /*
  * sgen_restart()
- * 	sgen_restart() is called after a timeout, when a command has been
- * 	postponed due to a TRAN_BUSY response from the HBA.
+ *	sgen_restart() is called after a timeout, when a command has been
+ *	postponed due to a TRAN_BUSY response from the HBA.
  */
 static void
 sgen_restart(void *arg)
@@ -1560,11 +1560,11 @@ sgen_restart(void *arg)
 
 /*
  * sgen_callback()
- * 	Command completion processing
+ *	Command completion processing
  *
- * 	sgen's completion processing is very pessimistic-- it does not retry
- * 	failed commands; instead, it allows the user application to make
- * 	decisions about what has gone wrong.
+ *	sgen's completion processing is very pessimistic-- it does not retry
+ *	failed commands; instead, it allows the user application to make
+ *	decisions about what has gone wrong.
  */
 static void
 sgen_callback(struct scsi_pkt *pkt)
@@ -1694,13 +1694,13 @@ sgen_initiate_sense(sgen_state_t *sg_state, int path_instance)
 
 /*
  * sgen_handle_incomplete()
- * 	sgen is pessimistic, but also careful-- it doesn't try to retry
- * 	incomplete commands, but it also doesn't go resetting devices;
- * 	it is hard to tell if the device will be tolerant of that sort
- * 	of prodding.
+ *	sgen is pessimistic, but also careful-- it doesn't try to retry
+ *	incomplete commands, but it also doesn't go resetting devices;
+ *	it is hard to tell if the device will be tolerant of that sort
+ *	of prodding.
  *
- * 	This routine has been left as a guide for the future--- the
- * 	current administration's hands-off policy may need modification.
+ *	This routine has been left as a guide for the future--- the
+ *	current administration's hands-off policy may need modification.
  */
 /*ARGSUSED*/
 static int
@@ -1712,12 +1712,12 @@ sgen_handle_incomplete(sgen_state_t *sg_state, struct scsi_pkt *pkt)
 
 /*
  * sgen_handle_autosense()
- * 	Deal with SENSE data acquired automatically via the auto-request-sense
- * 	facility.
+ *	Deal with SENSE data acquired automatically via the auto-request-sense
+ *	facility.
  *
- * 	Sgen takes a pessimistic view of things-- it doesn't retry commands,
- * 	and unless the device recovered from the problem, this routine returns
- * 	COMMAND_DONE_ERROR.
+ *	Sgen takes a pessimistic view of things-- it doesn't retry commands,
+ *	and unless the device recovered from the problem, this routine returns
+ *	COMMAND_DONE_ERROR.
  */
 static int
 sgen_handle_autosense(sgen_state_t *sg_state, struct scsi_pkt *pkt)
@@ -1806,7 +1806,7 @@ sgen_handle_autosense(sgen_state_t *sg_state, struct scsi_pkt *pkt)
 
 /*
  * sgen_handle_sense()
- * 	Examine sense data that was manually fetched from the target.
+ *	Examine sense data that was manually fetched from the target.
  */
 static int
 sgen_handle_sense(sgen_state_t *sg_state)
@@ -1889,7 +1889,7 @@ sgen_handle_sense(sgen_state_t *sg_state)
 
 /*
  * sgen_check_error()
- * 	examine the command packet for abnormal completion.
+ *	examine the command packet for abnormal completion.
  *
  *	sgen_check_error should only be called at the completion of the
  *	command packet.
@@ -1938,7 +1938,7 @@ sgen_check_error(sgen_state_t *sg_state, struct buf *bp)
 
 /*
  * sgen_tur()
- * 	test if a target is ready to operate by sending it a TUR command.
+ *	test if a target is ready to operate by sending it a TUR command.
  */
 static int
 sgen_tur(dev_t dev)
@@ -1960,8 +1960,8 @@ sgen_tur(dev_t dev)
 
 /*
  * sgen_diag_ok()
- * 	given an sg_state and a desired diagnostic level, return true if
- * 	it is acceptable to output a message.
+ *	given an sg_state and a desired diagnostic level, return true if
+ *	it is acceptable to output a message.
  */
 /*ARGSUSED*/
 static int
@@ -2043,8 +2043,8 @@ sgen_log(sgen_state_t *sg_state, int level, const char *fmt, ...)
 
 /*
  * sgen_dump_cdb()
- * 	dump out the contents of a cdb.  Take care that 'label' is not too
- * 	large, or 'buf' could overflow.
+ *	dump out the contents of a cdb.  Take care that 'label' is not too
+ *	large, or 'buf' could overflow.
  */
 static void
 sgen_dump_cdb(sgen_state_t *sg_state, const char *label,
diff --git a/usr/src/uts/common/io/scsi/targets/smp.c b/usr/src/uts/common/io/scsi/targets/smp.c
index 2fc021f66d..8121487ff2 100644
--- a/usr/src/uts/common/io/scsi/targets/smp.c
+++ b/usr/src/uts/common/io/scsi/targets/smp.c
@@ -247,7 +247,7 @@ smp_do_attach(dev_info_t *dip)
 	 * For simplicity, the minor number == the instance number
 	 */
 	if (ddi_create_minor_node(dip, "smp", S_IFCHR,
-	    instance, DDI_NT_SMP, NULL) == DDI_FAILURE) {
+	    instance, DDI_NT_SMP, 0) == DDI_FAILURE) {
 		smp_log(smp_state, CE_NOTE,
 		    "!smp_do_attach: minor node creation failed, "
 		    "device unit-address @%s", ddi_get_name_addr(dip));
diff --git a/usr/src/uts/common/io/scsi/targets/st.c b/usr/src/uts/common/io/scsi/targets/st.c
index 36768a9bde..545dd678f4 100644
--- a/usr/src/uts/common/io/scsi/targets/st.c
+++ b/usr/src/uts/common/io/scsi/targets/st.c
@@ -1144,7 +1144,7 @@ st_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 		minor |= MTMINOR(instance);
 
 		if (ddi_create_minor_node(devi, name, S_IFCHR, minor,
-		    DDI_NT_TAPE, NULL) == DDI_SUCCESS) {
+		    DDI_NT_TAPE, 0) == DDI_SUCCESS) {
 			continue;
 		}
 
diff --git a/usr/src/uts/common/io/signalfd.c b/usr/src/uts/common/io/signalfd.c
index 2a1cf25917..4dce53e22c 100644
--- a/usr/src/uts/common/io/signalfd.c
+++ b/usr/src/uts/common/io/signalfd.c
@@ -719,7 +719,7 @@ signalfd_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	}
 
 	if (ddi_create_minor_node(devi, "signalfd", S_IFCHR,
-	    SIGNALFDMNRN_SIGNALFD, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+	    SIGNALFDMNRN_SIGNALFD, DDI_PSEUDO, 0) == DDI_FAILURE) {
 		cmn_err(CE_NOTE, "/dev/signalfd couldn't create minor node");
 		ddi_soft_state_fini(&signalfd_softstate);
 		id_space_destroy(signalfd_minor);
diff --git a/usr/src/uts/common/io/sysevent.c b/usr/src/uts/common/io/sysevent.c
index 69065b9506..2f06b48292 100644
--- a/usr/src/uts/common/io/sysevent.c
+++ b/usr/src/uts/common/io/sysevent.c
@@ -703,7 +703,7 @@ sysevent_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	}
 
 	if (ddi_create_minor_node(devi, "sysevent", S_IFCHR,
-	    0, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+	    0, DDI_PSEUDO, 0) == DDI_FAILURE) {
 		ddi_remove_minor_node(devi, NULL);
 		return (DDI_FAILURE);
 	}
@@ -727,23 +727,24 @@ sysevent_detach(dev_info_t *devi, ddi_detach_cmd_t cmd)
 }
 
 static struct cb_ops sysevent_cb_ops = {
-	sysevent_open,		/* open */
-	sysevent_close,		/* close */
-	nodev,			/* strategy */
-	nodev,			/* print */
-	nodev,			/* dump */
-	nodev,			/* read */
-	nodev,			/* write */
-	sysevent_ioctl,		/* ioctl */
-	nodev,			/* devmap */
-	nodev,			/* mmap */
-	nodev,			/* segmap */
-	nochpoll,		/* poll */
-	ddi_prop_op,		/* prop_op */
-	0,			/* streamtab  */
-	D_NEW|D_MP,		/* flag */
-	NULL,			/* aread */
-	NULL			/* awrite */
+	.cb_open = sysevent_open,
+	.cb_close = sysevent_close,
+	.cb_strategy = nodev,
+	.cb_print = nodev,
+	.cb_dump = nodev,
+	.cb_read = nodev,
+	.cb_write = nodev,
+	.cb_ioctl = sysevent_ioctl,
+	.cb_devmap = nodev,
+	.cb_mmap = nodev,
+	.cb_segmap = nodev,
+	.cb_chpoll = nochpoll,
+	.cb_prop_op = ddi_prop_op,
+	.cb_str = NULL,
+	.cb_flag = D_NEW | D_MP,
+	.cb_rev = CB_REV,
+	.cb_aread = NULL,
+	.cb_awrite = NULL
 };
 
 static struct dev_ops sysevent_ops = {
@@ -756,7 +757,7 @@ static struct dev_ops sysevent_ops = {
 	sysevent_detach,	/* detach */
 	nodev,			/* reset */
 	&sysevent_cb_ops,	/* driver operations */
-	(struct bus_ops *)0,	/* no bus operations */
+	NULL,			/* no bus operations */
 	nulldev,		/* power */
 	ddi_quiesce_not_needed,		/* quiesce */
 };
diff --git a/usr/src/uts/common/io/tl.c b/usr/src/uts/common/io/tl.c
index 81a0cac18c..e77f33d31f 100644
--- a/usr/src/uts/common/io/tl.c
+++ b/usr/src/uts/common/io/tl.c
@@ -392,7 +392,7 @@
 #define		TL_ID		(104)		/* module ID number */
 #define		TL_NAME		"tl"		/* module name */
 #define		TL_MINPSZ	(0)		/* min packet size */
-#define		TL_MAXPSZ	INFPSZ 		/* max packet size ZZZ */
+#define		TL_MAXPSZ	INFPSZ		/* max packet size ZZZ */
 #define		TL_HIWAT	(16*1024)	/* hi water mark */
 #define		TL_LOWAT	(256)		/* lo water mark */
 /*
@@ -400,8 +400,8 @@
  * We view the socket use as a separate mode to get a separate name space.
  */
 #define		TL_TICOTS	0	/* connection oriented transport */
-#define		TL_TICOTSORD 	1	/* COTS w/ orderly release */
-#define		TL_TICLTS 	2	/* connectionless transport */
+#define		TL_TICOTSORD	1	/* COTS w/ orderly release */
+#define		TL_TICLTS	2	/* connectionless transport */
 #define		TL_UNUSED	3
 #define		TL_SOCKET	4	/* Socket */
 #define		TL_SOCK_COTS	(TL_SOCKET|TL_TICOTS)
@@ -576,7 +576,7 @@ struct tl_endpt {
 	queue_t		*te_rq;		/* stream read queue */
 	queue_t		*te_wq;		/* stream write queue */
 	uint32_t	te_refcnt;
-	int32_t 	te_state;	/* TPI state of endpoint */
+	int32_t		te_state;	/* TPI state of endpoint */
 	minor_t		te_minor;	/* minor number */
 #define	te_seqno	te_minor
 	uint_t		te_flag;	/* flag field */
@@ -974,7 +974,7 @@ tl_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 		if (ddi_create_minor_node(devi,
 		    tl_transports[i].tr_name,
 		    S_IFCHR, tl_transports[i].tr_minor,
-		    DDI_PSEUDO, NULL) == DDI_FAILURE) {
+		    DDI_PSEUDO, 0) == DDI_FAILURE) {
 			ddi_remove_minor_node(devi, NULL);
 			return (DDI_FAILURE);
 		}
@@ -1363,7 +1363,7 @@ tl_hash_by_addr(void *hash_data, mod_hash_key_t key)
 static int
 tl_hash_cmp_addr(mod_hash_key_t key1, mod_hash_key_t key2)
 {
-#ifdef 	DEBUG
+#ifdef	DEBUG
 	tl_addr_t *ap1 = (tl_addr_t *)key1;
 	tl_addr_t *ap2 = (tl_addr_t *)key2;
 
@@ -3062,7 +3062,7 @@ tl_conn_req_ser(mblk_t *mp, tl_endpt_t *tep)
 	void		*addr_startp;
 	t_scalar_t	olen = creq->OPT_length;
 	t_scalar_t	ooff = creq->OPT_offset;
-	size_t 		ci_msz;
+	size_t		ci_msz;
 	size_t		size;
 	cred_t		*cr = NULL;
 	pid_t		cpid;
@@ -3337,7 +3337,7 @@ tl_conn_res(mblk_t *mp, tl_endpt_t *tep)
 	t_scalar_t		olen, ooff, err = 0;
 	t_scalar_t		prim = cres->PRIM_type;
 	uchar_t			*addr_startp;
-	tl_endpt_t 		*acc_ep = NULL, *cl_ep = NULL;
+	tl_endpt_t		*acc_ep = NULL, *cl_ep = NULL;
 	tl_icon_t		*tip;
 	size_t			size;
 	mblk_t			*ackmp, *respmp;
@@ -5536,7 +5536,7 @@ tl_co_unconnect(tl_endpt_t *tep)
 	tl_endpt_t	*peer_tep = tep->te_conp;
 	tl_endpt_t	*srv_tep = tep->te_oconp;
 	list_t		*l;
-	tl_icon_t  	*tip;
+	tl_icon_t	*tip;
 	tl_endpt_t	*cl_tep;
 	mblk_t		*d_mp;
 
diff --git a/usr/src/uts/common/io/tty_pts.c b/usr/src/uts/common/io/tty_pts.c
index 57f7a22978..2e69280908 100644
--- a/usr/src/uts/common/io/tty_pts.c
+++ b/usr/src/uts/common/io/tty_pts.c
@@ -184,7 +184,7 @@ ptsl_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	for (tty_num = 0; tty_num < npty; tty_num++) {
 		(void) sprintf(name, "tty%c%c", *tty_bank, *tty_digit);
 		if (ddi_create_minor_node(devi, name, S_IFCHR,
-		    tty_num, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+		    tty_num, DDI_PSEUDO, 0) == DDI_FAILURE) {
 			ddi_remove_minor_node(devi, NULL);
 			return (-1);
 		}
diff --git a/usr/src/uts/common/io/tty_pty.c b/usr/src/uts/common/io/tty_pty.c
index a8eea823be..c1e15de161 100644
--- a/usr/src/uts/common/io/tty_pty.c
+++ b/usr/src/uts/common/io/tty_pty.c
@@ -75,7 +75,7 @@ struct cb_ops	ptc_cb_ops = {
 	nodev,			/* dump */
 	ptcread,		/* read */
 	ptcwrite,		/* write */
-	ptcioctl, 		/* ioctl */
+	ptcioctl,		/* ioctl */
 	nodev,			/* devmap */
 	nodev,			/* mmap */
 	nodev,			/* segmap */
@@ -169,7 +169,7 @@ ptc_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	for (pty_num = 0; pty_num < npty; pty_num++) {
 		(void) sprintf(name, "pty%c%c", *pty_bank, *pty_digit);
 		if (ddi_create_minor_node(devi, name, S_IFCHR,
-		    pty_num, DDI_PSEUDO, NULL) == DDI_FAILURE) {
+		    pty_num, DDI_PSEUDO, 0) == DDI_FAILURE) {
 			ddi_remove_minor_node(devi, NULL);
 			return (-1);
 		}
@@ -975,11 +975,8 @@ ptcioctl(dev_t dev, int cmd, intptr_t data, int flag, struct cred *cred,
 
 
 int
-ptcpoll(dev_t dev,
-	short events,
-	int anyyet,
-	short *reventsp,
-	struct pollhead **phpp)
+ptcpoll(dev_t dev, short events, int anyyet, short *reventsp,
+    struct pollhead **phpp)
 {
 	struct pty *pty = &pty_softc[getminor(dev)];
 	pollhead_t *php = &ptcph;
diff --git a/usr/src/uts/common/io/usb/clients/usbms/usbms.c b/usr/src/uts/common/io/usb/clients/usbms/usbms.c
index 5ed65d98bd..7fedd60f04 100644
--- a/usr/src/uts/common/io/usb/clients/usbms/usbms.c
+++ b/usr/src/uts/common/io/usb/clients/usbms/usbms.c
@@ -30,6 +30,7 @@
 
 #include <sys/stropts.h>
 #include <sys/strsun.h>
+#include <sys/systm.h>
 #include <sys/vuid_event.h>
 #include <sys/vuid_wheel.h>
 #include <sys/termios.h>
@@ -104,82 +105,46 @@ _info(struct modinfo *modinfop)
 
 
 /* Function prototypes */
-static void		usbms_reioctl(void *);
-static void		usbms_ioctl(queue_t *, mblk_t *);
-static int		usbms_open();
-static int		usbms_close();
-static int		usbms_wput();
-static void		usbms_rput();
-static void		usbms_mctl_receive(
-				register queue_t	*q,
-				register mblk_t		*mp);
-
-static void		usbms_rserv(queue_t		*q);
-static void		usbms_miocdata(
-				register queue_t 	*q,
-				register mblk_t 	*mp);
-
-static void		usbms_resched(void *);
-
-static int		usbms_getparms(
-				register Ms_parms	*data,
-				usbms_state_t		*usbmsp);
-
-static int		usbms_setparms(
-				register Ms_parms	*data,
-				usbms_state_t		*usbmsp);
-
-static int		usbms_get_screen_parms(
-				register queue_t	*q,
-				register mblk_t		*datap);
-
-static void		usbms_flush(usbms_state_t	*usbmsp);
-
-static void		usbms_incr(void *);
-static void		usbms_input(
-				usbms_state_t		*usbmsp,
-				mblk_t			*mp);
-static void		usbms_rserv_vuid_button(
-				queue_t			*q,
-				struct usbmouseinfo	*mi,
-				mblk_t			**bpaddr);
-
-static void		usbms_rserv_vuid_event_y(
-				queue_t			*q,
-				struct usbmouseinfo	*mi,
-				mblk_t			**bpaddr);
-static void		usbms_rserv_vuid_event_x(
-				queue_t			*q,
-				struct usbmouseinfo	*mi,
-				mblk_t			**bpaddr);
-static void 		usbms_rserv_vuid_event_wheel(
-				queue_t *,
-				struct usbmouseinfo *,
-				mblk_t **,
-				ushort_t id);
-static int		usbms_check_for_wheels(usbms_state_t *);
-static int		usbms_make_copyreq(
-				mblk_t 	*,
-				uint_t 	pvtsize,
-				uint_t	state,
-				uint_t	reqsize,
-				uint_t	contsize,
-				uint_t	copytype);
-static int		usbms_service_wheel_info(
-				queue_t	*,
-				mblk_t	*);
-static int		usbms_service_wheel_state(
-				queue_t	*,
-				mblk_t	*,
-				uint_t	cmd);
-static void		usbms_ack_ioctl(mblk_t	*);
-static int		usbms_read_input_data_format(usbms_state_t *);
-static mblk_t		*usbms_setup_abs_mouse_event();
-static int		usbms_get_coordinate(
-				uint_t			pos,
-				uint_t			len,
-				mblk_t			*mp);
-extern void		uniqtime32();
+static void usbms_reioctl(void *);
+static void usbms_ioctl(queue_t *, mblk_t *);
+static int usbms_open(queue_t *, dev_t *, int, int, cred_t *);
+static int usbms_close(queue_t *, int, cred_t *);
+static int usbms_wput(queue_t *, mblk_t *);
+static int usbms_rput(queue_t *, mblk_t *);
+static void usbms_mctl_receive(queue_t *, mblk_t *);
+
+static int usbms_rserv(queue_t *);
+static void usbms_miocdata(queue_t *, mblk_t *);
+
+static void usbms_resched(void *);
+
+static int usbms_getparms(Ms_parms *, usbms_state_t *);
+
+static int usbms_setparms(Ms_parms *, usbms_state_t *);
+
+static int usbms_get_screen_parms(queue_t *q, mblk_t *);
+
+static void usbms_flush(usbms_state_t *);
+
+static void usbms_incr(void *);
+static void usbms_input(usbms_state_t *, mblk_t	*);
+static void usbms_rserv_vuid_button(queue_t *, struct usbmouseinfo *,
+    mblk_t **);
+
+static void usbms_rserv_vuid_event_y(queue_t *, struct usbmouseinfo *,
+    mblk_t **);
+static void usbms_rserv_vuid_event_x(queue_t *, struct usbmouseinfo *,
+    mblk_t **);
+static void usbms_rserv_vuid_event_wheel(queue_t *, struct usbmouseinfo *,
+    mblk_t **, ushort_t);
+static int usbms_check_for_wheels(usbms_state_t *);
+static int usbms_make_copyreq(mblk_t *, uint_t, uint_t, uint_t, uint_t, uint_t);
+static int usbms_service_wheel_info(queue_t *, mblk_t *);
+static int usbms_service_wheel_state(queue_t *, mblk_t *, uint_t);
+static void usbms_ack_ioctl(mblk_t *);
+static int usbms_read_input_data_format(usbms_state_t *);
+static mblk_t *usbms_setup_abs_mouse_event(void);
+static int usbms_get_coordinate(uint_t, uint_t, mblk_t *);
 
 /*
  * Device driver qinit functions
@@ -195,8 +160,8 @@ static struct module_info usbms_mod_info = {
 
 /* read side queue information structure */
 static struct qinit rinit = {
-	(int (*)())usbms_rput,	/* put procedure not needed */
-	(int (*)())usbms_rserv, /* service procedure */
+	usbms_rput,		/* put procedure not needed */
+	usbms_rserv,		/* service procedure */
 	usbms_open,		/* called on startup */
 	usbms_close,		/* called on finish */
 	NULL,			/* for future use */
@@ -249,15 +214,10 @@ static uint16_t			usbms_buf_bytes = USBMS_BUF_BYTES;
  */
 /*ARGSUSED*/
 static int
-usbms_open(queue_t			*q,
-	dev_t				*devp,
-	int				flag,
-	int				sflag,
-	cred_t				*credp)
-
+usbms_open(queue_t *q, dev_t *devp, int flag, int sflag, cred_t *credp)
 {
-	register struct usbmousebuf	*mousebufp;
-	register struct ms_softc	*msd_soft;
+	struct usbmousebuf	*mousebufp;
+	struct ms_softc	*msd_soft;
 	usbms_state_t			*usbmsp;
 	struct iocblk			mctlmsg;
 	mblk_t				*mctl_ptr;
@@ -304,15 +264,13 @@ usbms_open(queue_t			*q,
 	 * Allocate buffer and initialize data.
 	 */
 	msd_soft->ms_bufbytes = usbms_buf_bytes;
-	mousebufp = kmem_zalloc((uint_t)msd_soft->ms_bufbytes,
-				KM_SLEEP);
+	mousebufp = kmem_zalloc(msd_soft->ms_bufbytes, KM_SLEEP);
 
 	/* Truncation  will happen */
 	mousebufp->mb_size = (uint16_t)((msd_soft->ms_bufbytes -
-				    sizeof (struct usbmousebuf)) /
-				    sizeof (struct usbmouseinfo));
+	    sizeof (struct usbmousebuf)) / sizeof (struct usbmouseinfo));
 	mousebufp->mb_info = (struct usbmouseinfo *)((char *)mousebufp +
-				    sizeof (struct usbmousebuf));
+	    sizeof (struct usbmousebuf));
 	usbmsp->usbms_buf = mousebufp;
 	msd_soft->ms_vuidaddr = VKEY_FIRST;
 	usbmsp->usbms_jittertimeout = JITTER_TIMEOUT;
@@ -351,32 +309,32 @@ usbms_open(queue_t			*q,
 
 	if (usbmsp->usbms_report_descr_handle != NULL) {
 		if (hidparser_get_usage_attribute(
-				usbmsp->usbms_report_descr_handle,
-				0,
-				HIDPARSER_ITEM_INPUT,
-				USBMS_USAGE_PAGE_BUTTON,
-				0,
-				HIDPARSER_ITEM_REPORT_COUNT,
-				(int32_t *)&usbmsp->usbms_num_buttons) ==
-				HIDPARSER_SUCCESS) {
+		    usbmsp->usbms_report_descr_handle,
+		    0,
+		    HIDPARSER_ITEM_INPUT,
+		    USBMS_USAGE_PAGE_BUTTON,
+		    0,
+		    HIDPARSER_ITEM_REPORT_COUNT,
+		    (int32_t *)&usbmsp->usbms_num_buttons) ==
+		    HIDPARSER_SUCCESS) {
 			if (usbmsp->usbms_num_buttons > USB_MS_MAX_BUTTON_NO)
 				usbmsp->usbms_num_buttons =
-					USB_MS_MAX_BUTTON_NO;
+				    USB_MS_MAX_BUTTON_NO;
 			USB_DPRINTF_L2(PRINT_MASK_ALL,
-				usbms_log_handle, "Num of buttons is : %d",
-				usbmsp->usbms_num_buttons);
+			    usbms_log_handle, "Num of buttons is : %d",
+			    usbmsp->usbms_num_buttons);
 		} else {
 			USB_DPRINTF_L3(PRINT_MASK_OPEN,
-				usbms_log_handle,
-				"hidparser_get_usage_attribute failed : "
-				"Set to default number of buttons(3).");
+			    usbms_log_handle,
+			    "hidparser_get_usage_attribute failed : "
+			    "Set to default number of buttons(3).");
 
 			usbmsp->usbms_num_buttons = USB_MS_DEFAULT_BUTTON_NO;
 		}
 	} else {
 		USB_DPRINTF_L1(PRINT_MASK_ALL,
-			usbms_log_handle, "Invalid HID "
-			"Descriptor Tree. Set to default value(3 buttons).");
+		    usbms_log_handle, "Invalid HID "
+		    "Descriptor Tree. Set to default value(3 buttons).");
 		usbmsp->usbms_num_buttons = USB_MS_DEFAULT_BUTTON_NO;
 	}
 
@@ -416,12 +374,10 @@ usbms_open(queue_t			*q,
  */
 /*ARGSUSED*/
 static int
-usbms_close(queue_t			*q,
-	int 				flag,
-	cred_t 				*credp)
+usbms_close(queue_t *q, int flag, cred_t *credp)
 {
 	usbms_state_t			*usbmsp = q->q_ptr;
-	register struct	ms_softc	*ms = &usbmsp->usbms_softc;
+	struct	ms_softc	*ms = &usbmsp->usbms_softc;
 
 	USB_DPRINTF_L3(PRINT_MASK_CLOSE, usbms_log_handle,
 	    "usbms_close entering");
@@ -476,7 +432,7 @@ usbms_close(queue_t			*q,
  *	Read queue service routine.
  *	Turn buffered mouse events into stream messages.
  */
-static void
+static int
 usbms_rserv(queue_t		*q)
 {
 	usbms_state_t		*usbmsp = q->q_ptr;
@@ -484,7 +440,7 @@ usbms_rserv(queue_t		*q)
 	struct usbmousebuf	*b;
 	struct usbmouseinfo	*mi;
 	mblk_t			*bp;
-	ushort_t 		i, loop;
+	ushort_t		i, loop;
 	uchar_t			nbutt = (uchar_t)usbmsp->usbms_num_buttons;
 
 	ms = &usbmsp->usbms_softc;
@@ -498,14 +454,14 @@ usbms_rserv(queue_t		*q)
 		switch (ms->ms_readformat) {
 
 		case MS_3BYTE_FORMAT: {
-			register char	*cp;
+			char	*cp;
 
 			if ((usbmsp->usbms_idf).xlen != 1) {
 				USB_DPRINTF_L3(PRINT_MASK_SERV,
 				    usbms_log_handle,
 				    "Can't set to 3 byte format. Length != 1");
 
-				return;
+				return (0);
 			}
 			if ((bp = allocb(3, BPRI_HI)) != NULL) {
 				cp = (char *)bp->b_wptr;
@@ -532,7 +488,7 @@ usbms_rserv(queue_t		*q)
 				    (void *) usbmsp);
 				if (usbmsp->usbms_resched_id == 0)
 
-					return;	/* try again later */
+					return (0);	/* try again later */
 				/* bufcall failed; just pitch this event */
 				/* or maybe flush queue? */
 			}
@@ -612,6 +568,7 @@ usbms_rserv(queue_t		*q)
 	}
 	USB_DPRINTF_L3(PRINT_MASK_SERV, usbms_log_handle,
 	    "usbms_rserv exiting");
+	return (0);
 }
 
 
@@ -620,10 +577,8 @@ usbms_rserv(queue_t		*q)
  *	convert wheel data to firm events
  */
 static void
-usbms_rserv_vuid_event_wheel(queue_t		*q,
-			struct usbmouseinfo	*mi,
-			mblk_t			**bpaddr,
-			ushort_t 		id)
+usbms_rserv_vuid_event_wheel(queue_t *q, struct usbmouseinfo *mi,
+    mblk_t **bpaddr, ushort_t id)
 {
 	Firm_event *fep;
 	mblk_t *tmp;
@@ -671,9 +626,7 @@ usbms_rserv_vuid_event_wheel(queue_t		*q,
  *	Process a VUID button event
  */
 static void
-usbms_rserv_vuid_button(queue_t			*q,
-			struct usbmouseinfo	*mi,
-			mblk_t			**bpaddr)
+usbms_rserv_vuid_button(queue_t *q, struct usbmouseinfo	*mi, mblk_t **bpaddr)
 {
 	usbms_state_t		*usbmsp = q->q_ptr;
 	struct ms_softc	*ms;
@@ -782,13 +735,11 @@ usbms_rserv_vuid_button(queue_t			*q,
  *	Process a VUID y-event
  */
 static void
-usbms_rserv_vuid_event_y(register queue_t		*q,
-			register struct usbmouseinfo	*mi,
-			mblk_t				**bpaddr)
+usbms_rserv_vuid_event_y(queue_t *q, struct usbmouseinfo *mi, mblk_t **bpaddr)
 {
 	usbms_state_t			*usbmsp = q->q_ptr;
-	register struct ms_softc	*ms;
-	register Firm_event		*fep;
+	struct ms_softc	*ms;
+	Firm_event		*fep;
 	mblk_t				*bp;
 
 	ms = &usbmsp->usbms_softc;
@@ -873,13 +824,11 @@ usbms_rserv_vuid_event_y(register queue_t		*q,
  *	Process a VUID x-event
  */
 static void
-usbms_rserv_vuid_event_x(register queue_t		*q,
-			register struct usbmouseinfo	*mi,
-			mblk_t				**bpaddr)
+usbms_rserv_vuid_event_x(queue_t *q, struct usbmouseinfo *mi, mblk_t **bpaddr)
 {
 	usbms_state_t			*usbmsp = q->q_ptr;
-	register struct ms_softc	*ms;
-	register Firm_event		*fep;
+	struct ms_softc	*ms;
+	Firm_event		*fep;
 	mblk_t				*bp;
 
 	ms = &usbmsp->usbms_softc;
@@ -962,10 +911,10 @@ usbms_rserv_vuid_event_x(register queue_t		*q,
  *	enables the queue.
  */
 static void
-usbms_resched(void 	* usbmsp)
+usbms_resched(void *usbmsp)
 {
-	register queue_t	*q;
-	register usbms_state_t	*tmp_usbmsp = (usbms_state_t *)usbmsp;
+	queue_t	*q;
+	usbms_state_t	*tmp_usbmsp = (usbms_state_t *)usbmsp;
 
 	tmp_usbmsp->usbms_resched_id = 0;
 	if ((q = tmp_usbmsp->usbms_rq_ptr) != 0)
@@ -978,8 +927,7 @@ usbms_resched(void 	* usbmsp)
  *	Module below : hid, module above : consms
  */
 static int
-usbms_wput(queue_t		*q,
-	mblk_t			*mp)
+usbms_wput(queue_t *q, mblk_t *mp)
 {
 	USB_DPRINTF_L3(PRINT_MASK_ALL, usbms_log_handle,
 	    "usbms_wput entering");
@@ -1021,18 +969,17 @@ usbms_wput(queue_t		*q,
  *	Process ioctls we recognize and own.  Otherwise, NAK.
  */
 static void
-usbms_ioctl(register queue_t		*q,
-		register mblk_t		*mp)
+usbms_ioctl(queue_t *q, mblk_t *mp)
 {
 	usbms_state_t *usbmsp = (usbms_state_t *)q->q_ptr;
-	register struct ms_softc 	*ms;
-	register struct iocblk 		*iocp;
-	Vuid_addr_probe			*addr_probe;
-	uint_t				ioctlrespsize;
-	int				err = 0;
-	mblk_t				*datap;
-	ushort_t			transparent = 0;
-	boolean_t			report_abs = B_FALSE;
+	struct ms_softc		*ms;
+	struct iocblk		*iocp;
+	Vuid_addr_probe		*addr_probe;
+	uint_t			ioctlrespsize;
+	int			err = 0;
+	mblk_t			*datap;
+	ushort_t		transparent = 0;
+	boolean_t		report_abs = B_FALSE;
 	mblk_t	*mb;
 
 	USB_DPRINTF_L3(PRINT_MASK_IOCTL, usbms_log_handle,
@@ -1330,8 +1277,7 @@ allocfailure:
  * VUIDGWHEELSTATE, VUIDSWHEELSTATE & MSIOSRESOLUTION.
  */
 static void
-usbms_miocdata(register 	queue_t *q,
-		register 	mblk_t  *mp)
+usbms_miocdata(queue_t *q, mblk_t *mp)
 {
 	struct copyresp *copyresp;
 	struct iocblk *iocbp;
@@ -1467,8 +1413,8 @@ static void
 usbms_reioctl(void	* usbms_addr)
 {
 	usbms_state_t *usbmsp = (usbms_state_t *)usbms_addr;
-	register queue_t 	*q;
-	register mblk_t 	*mp;
+	queue_t	*q;
+	mblk_t	*mp;
 
 	q = usbmsp->usbms_wq_ptr;
 	if ((mp = usbmsp->usbms_iocpending) != NULL) {
@@ -1484,8 +1430,7 @@ usbms_reioctl(void	* usbms_addr)
  *	values.
  */
 static int
-usbms_getparms(register Ms_parms	*data,
-		usbms_state_t		*usbmsp)
+usbms_getparms(Ms_parms	*data, usbms_state_t *usbmsp)
 {
 	data->jitter_thresh = usbmsp->usbms_jitter_thresh;
 	data->speed_law = usbmsp->usbms_speedlaw;
@@ -1502,8 +1447,7 @@ usbms_getparms(register Ms_parms	*data,
  *	values.
  */
 static int
-usbms_setparms(register Ms_parms	*data,
-		usbms_state_t		*usbmsp)
+usbms_setparms(Ms_parms	*data, usbms_state_t *usbmsp)
 {
 	usbmsp->usbms_jitter_thresh = data->jitter_thresh;
 	usbmsp->usbms_speedlaw = data->speed_law;
@@ -1518,10 +1462,10 @@ usbms_setparms(register Ms_parms	*data,
  *	and sends M_FLUSH above.
  */
 static void
-usbms_flush(usbms_state_t		*usbmsp)
+usbms_flush(usbms_state_t *usbmsp)
 {
-	register struct ms_softc *ms = &usbmsp->usbms_softc;
-	register queue_t		*q;
+	struct ms_softc *ms = &usbmsp->usbms_softc;
+	queue_t		*q;
 
 	USB_DPRINTF_L3(PRINT_MASK_ALL, usbms_log_handle,
 	    "usbms_flush entering");
@@ -1544,9 +1488,8 @@ usbms_flush(usbms_state_t		*usbmsp)
  * usbms_rput() :
  *	Put procedure for input from driver end of stream (read queue).
  */
-static void
-usbms_rput(queue_t		*q,
-		mblk_t		*mp)
+static int
+usbms_rput(queue_t *q, mblk_t *mp)
 {
 	usbms_state_t *usbmsp = q->q_ptr;
 	mblk_t	*tmp_mp;
@@ -1558,7 +1501,7 @@ usbms_rput(queue_t		*q,
 	if (usbmsp == 0) {
 		freemsg(mp);	/* nobody's listening */
 
-		return;
+		return (0);
 	}
 
 	switch (mp->b_datap->db_type) {
@@ -1570,7 +1513,7 @@ usbms_rput(queue_t		*q,
 			flushq(q, FLUSHDATA);
 		freemsg(mp);
 
-		return;
+		return (0);
 
 	case M_BREAK:
 		/*
@@ -1580,20 +1523,20 @@ usbms_rput(queue_t		*q,
 
 		freemsg(mp);
 
-		return;
+		return (0);
 
 	case M_DATA:
 		if (!(usbmsp->usbms_flags & USBMS_OPEN)) {
 			freemsg(mp);	/* not ready to listen */
 
-			return;
+			return (0);
 		}
 		break;
 
 	case M_CTL:
 		usbms_mctl_receive(q, mp);
 
-		return;
+		return (0);
 
 	case M_ERROR:
 		usbmsp->usbms_protoerr = 1;
@@ -1604,11 +1547,11 @@ usbms_rput(queue_t		*q,
 			freemsg(mp);
 		}
 
-		return;
+		return (0);
 	default:
 		putnext(q, mp);
 
-		return;
+		return (0);
 	}
 
 	/*
@@ -1618,14 +1561,14 @@ usbms_rput(queue_t		*q,
 	if ((MBLKL(tmp_mp) < limit) || ((MBLKL(tmp_mp) == limit) &&
 	    (usbmsp->usbms_rptid != HID_REPORT_ID_UNDEFINED))) {
 		freemsg(mp);
-		return;
+		return (0);
 	}
 	do {
 		if (usbmsp->usbms_rptid != HID_REPORT_ID_UNDEFINED) {
 			if (*(tmp_mp->b_rptr) != usbmsp->usbms_rptid) {
 				freemsg(mp);
 
-				return;
+				return (0);
 			} else {
 				/* We skip the report id prefix. */
 				tmp_mp->b_rptr++;
@@ -1636,6 +1579,7 @@ usbms_rput(queue_t		*q,
 	} while ((tmp_mp = tmp_mp->b_cont) != NULL);   /* next block, if any */
 
 	freemsg(mp);
+	return (0);
 }
 
 
@@ -1645,8 +1589,7 @@ usbms_rput(queue_t		*q,
  *	we don't understand the command, free message.
  */
 static void
-usbms_mctl_receive(register queue_t		*q,
-			register mblk_t		*mp)
+usbms_mctl_receive(queue_t *q, mblk_t *mp)
 {
 	usbms_state_t *usbmsd = (usbms_state_t *)q->q_ptr;
 	struct iocblk				*iocp;
@@ -1703,13 +1646,12 @@ usbms_mctl_receive(register queue_t		*q,
  *	Watch out for overflow!
  */
 static void
-usbms_input(usbms_state_t		*usbmsp,
-		mblk_t			*mp)
+usbms_input(usbms_state_t *usbmsp, mblk_t *mp)
 {
-	register struct usbmousebuf	*b;
-	register struct usbmouseinfo	*mi;
-	register int			jitter_radius;
-	register int32_t		nbutt;
+	struct usbmousebuf	*b;
+	struct usbmouseinfo	*mi;
+	int			jitter_radius;
+	int32_t		nbutt;
 	ushort_t			i;
 	char				c;
 
@@ -1885,13 +1827,13 @@ static void
 usbms_incr(void				*arg)
 {
 	usbms_state_t			*usbmsp = arg;
-	register struct ms_softc	*ms = &usbmsp->usbms_softc;
-	register struct usbmousebuf	*b;
-	register struct usbmouseinfo	*mi;
-	register int			xc, yc, zc;
-	register int			wake;
-	register int			speedl = usbmsp->usbms_speedlimit;
-	register int			xabs, yabs;
+	struct ms_softc	*ms = &usbmsp->usbms_softc;
+	struct usbmousebuf	*b;
+	struct usbmouseinfo	*mi;
+	int			xc, yc, zc;
+	int			wake;
+	int			speedl = usbmsp->usbms_speedlimit;
+	int			xabs, yabs;
 
 	/*
 	 * No longer waiting for jitter timeout
@@ -2023,12 +1965,8 @@ usbms_check_for_wheels(usbms_state_t *usbmsp)
  *	helper function for usbms ioctls
  */
 static int
-usbms_make_copyreq(mblk_t 	*mp,
-		    uint_t 	pvtsize,
-		    uint_t 	state,
-		    uint_t 	reqsize,
-		    uint_t 	contsize,
-		    uint_t 	copytype)
+usbms_make_copyreq(mblk_t *mp, uint_t pvtsize, uint_t state, uint_t reqsize,
+    uint_t contsize, uint_t copytype)
 {
 
 	struct copyreq		*cq;
@@ -2065,7 +2003,7 @@ usbms_make_copyreq(mblk_t 	*mp,
 		 * overlaps iocp->ioc_count. If user address (cq_addr)
 		 * is invalid, it would cause panic later in
 		 * usbms_miocdata:
-		 * 	freemsg((mblk_t *)copyresp->cp_private);
+		 *	freemsg((mblk_t *)copyresp->cp_private);
 		 */
 		cq->cq_private = NULL;
 		}
@@ -2099,7 +2037,7 @@ usbms_make_copyreq(mblk_t 	*mp,
 
 
 static int
-usbms_service_wheel_info(register queue_t *q, register mblk_t	*datap)
+usbms_service_wheel_info(queue_t *q, mblk_t	*datap)
 {
 
 	wheel_info		*wi;
@@ -2125,9 +2063,7 @@ usbms_service_wheel_info(register queue_t *q, register mblk_t	*datap)
 
 
 static int
-usbms_service_wheel_state(register queue_t	*q,
-			    register mblk_t	*datap,
-			    register uint_t	cmd)
+usbms_service_wheel_state(queue_t *q, mblk_t *datap, uint_t cmd)
 {
 
 	wheel_state	*ws;
@@ -2173,8 +2109,7 @@ usbms_service_wheel_state(register queue_t	*q,
  *	current screen height/width params from X.
  */
 static int
-usbms_get_screen_parms(register queue_t	*q,
-			    register mblk_t	*datap)
+usbms_get_screen_parms(queue_t *q, mblk_t *datap)
 {
 
 	usbms_state_t	*usbmsp = (usbms_state_t *)q->q_ptr;
@@ -2190,7 +2125,7 @@ usbms_get_screen_parms(register queue_t	*q,
 
 
 static void
-usbms_ack_ioctl(mblk_t	*mp)
+usbms_ack_ioctl(mblk_t *mp)
 {
 
 	struct iocblk	*iocbp = (struct iocblk *)mp->b_rptr;
@@ -2213,7 +2148,7 @@ usbms_ack_ioctl(mblk_t	*mp)
  *	the absolute mouse type firm event.
  */
 static mblk_t *
-usbms_setup_abs_mouse_event()
+usbms_setup_abs_mouse_event(void)
 {
 	mblk_t	*mb;
 	Firm_event *fep;
@@ -2254,7 +2189,7 @@ usbms_read_input_data_format(usbms_state_t *usbmsp)
 	usbms_idf *idf = &(usbmsp->usbms_idf);
 	Ms_screen_resolution *res = &(usbmsp->usbms_resolution);
 	mblk_t *mb;
-	register queue_t 	*q;
+	queue_t	*q;
 	int	rval;
 
 	usbmsp->usbms_rpt_abs = B_FALSE;
diff --git a/usr/src/uts/common/rpc/rpcib.c b/usr/src/uts/common/rpc/rpcib.c
index 6908b95d4f..f8b8346506 100644
--- a/usr/src/uts/common/rpc/rpcib.c
+++ b/usr/src/uts/common/rpc/rpcib.c
@@ -1039,7 +1039,7 @@ rib_clnt_scq_handler(ibt_cq_hdl_t cq_hdl, void *arg)
 			default:
 /*
  *    RC Send Q Error Code		Local state     Remote State
- *    ==================== 		===========     ============
+ *    ====================		===========     ============
  *    IBT_WC_BAD_RESPONSE_ERR             ERROR           None
  *    IBT_WC_LOCAL_LEN_ERR                ERROR           None
  *    IBT_WC_LOCAL_CHAN_OP_ERR            ERROR           None
@@ -1797,7 +1797,7 @@ rib_conn_to_srv(rib_hca_t *hca, rib_qp_t *qp, rpcib_ping_t *rptp)
 	ibt_chan_sizes_t	chan_sizes;
 	ibt_rc_chan_alloc_args_t	qp_attr;
 	ibt_status_t		ibt_status;
-	ibt_rc_returns_t	ret_args;   	/* conn reject info */
+	ibt_rc_returns_t	ret_args;	/* conn reject info */
 	int refresh = REFRESH_ATTEMPTS;	/* refresh if IBT_CM_CONN_STALE */
 	ibt_ip_cm_info_t	ipcm_info;
 	uint8_t cmp_ip_pvt[IBT_IP_HDR_PRIV_DATA_SZ];
@@ -1963,7 +1963,7 @@ rib_ping_srv(int addr_type, struct netbuf *raddr, rpcib_ping_t *rptp)
 			continue;
 		}
 
-		ipattr.ipa_dst_ip 	= &rptp->dstip;
+		ipattr.ipa_dst_ip	= &rptp->dstip;
 		ipattr.ipa_hca_guid	= hca->hca_guid;
 		ipattr.ipa_ndst		= 1;
 		ipattr.ipa_max_paths	= 1;
@@ -3592,7 +3592,7 @@ rib_addreplylist(rib_qp_t *qp, uint32_t msgid)
 		return (NULL);
 	}
 	rep->xid = msgid;
-	rep->vaddr_cq = NULL;
+	rep->vaddr_cq = 0;
 	rep->bytes_xfer = 0;
 	rep->status = (uint_t)REPLY_WAIT;
 	rep->prev = NULL;
@@ -3672,7 +3672,7 @@ rib_registermem(CONN *conn,  caddr_t adsp, caddr_t buf, uint_t buflen,
 		buf_handle->mrc_lmr = (uint32_t)mr_desc.md_lkey;
 		buf_handle->mrc_rmr = (uint32_t)mr_desc.md_rkey;
 	} else {
-		buf_handle->mrc_linfo = NULL;
+		buf_handle->mrc_linfo = (uintptr_t)NULL;
 		buf_handle->mrc_lmr = 0;
 		buf_handle->mrc_rmr = 0;
 	}
@@ -3754,7 +3754,7 @@ rib_registermemsync(CONN *conn,  caddr_t adsp, caddr_t buf, uint_t buflen,
 		buf_handle->mrc_rmr = (uint32_t)mr_desc.md_rkey;
 		*sync_handle = (RIB_SYNCMEM_HANDLE)mr_hdl;
 	} else {
-		buf_handle->mrc_linfo = NULL;
+		buf_handle->mrc_linfo = (uintptr_t)NULL;
 		buf_handle->mrc_lmr = 0;
 		buf_handle->mrc_rmr = 0;
 	}
@@ -4707,7 +4707,7 @@ rib_close_a_channel(CONN *conn)
 static void
 rib_close_channels(rib_conn_list_t *connlist)
 {
-	CONN 		*conn, *tmp;
+	CONN		*conn, *tmp;
 
 	rw_enter(&connlist->conn_lock, RW_READER);
 	conn = connlist->conn_hd;
@@ -4750,7 +4750,7 @@ next:
 static void
 rib_purge_connlist(rib_conn_list_t *connlist)
 {
-	CONN 		*conn;
+	CONN		*conn;
 
 top:
 	rw_enter(&connlist->conn_lock, RW_READER);
@@ -5041,7 +5041,7 @@ rib_get_cache_buf(CONN *conn, uint32_t len)
 	cache_avl_struct_t	cas, *rcas;
 	rib_hca_t	*hca = (ctoqp(conn))->hca;
 	rib_lrc_entry_t *reply_buf;
-	avl_index_t where = NULL;
+	avl_index_t where = (uintptr_t)NULL;
 	uint64_t c_alloc = 0;
 
 	if (!hca->avl_init)
@@ -5152,7 +5152,7 @@ static void
 rib_free_cache_buf(CONN *conn, rib_lrc_entry_t *reg_buf)
 {
 	cache_avl_struct_t    cas, *rcas;
-	avl_index_t where = NULL;
+	avl_index_t where = (uintptr_t)NULL;
 	rib_hca_t	*hca = (ctoqp(conn))->hca;
 
 	if (!hca->avl_init)
@@ -5205,7 +5205,7 @@ rib_registermem_via_hca(rib_hca_t *hca, caddr_t adsp, caddr_t buf,
 		buf_handle->mrc_lmr = (uint32_t)mr_desc.md_lkey;
 		buf_handle->mrc_rmr = (uint32_t)mr_desc.md_rkey;
 	} else {
-		buf_handle->mrc_linfo = NULL;
+		buf_handle->mrc_linfo = (uintptr_t)NULL;
 		buf_handle->mrc_lmr = 0;
 		buf_handle->mrc_rmr = 0;
 	}
diff --git a/usr/src/uts/common/sys/pcie_impl.h b/usr/src/uts/common/sys/pcie_impl.h
index 584bba2ebe..0e37a515eb 100644
--- a/usr/src/uts/common/sys/pcie_impl.h
+++ b/usr/src/uts/common/sys/pcie_impl.h
@@ -116,19 +116,19 @@ extern "C" {
 #define	PCIE_PUT(sz, bus_p, off, val) \
 	pci_config_put ## sz(bus_p->bus_cfg_hdl, off, val)
 #define	PCIE_CAP_GET(sz, bus_p, off) \
-	PCI_CAP_GET ## sz(bus_p->bus_cfg_hdl, NULL, bus_p->bus_pcie_off, off)
+	PCI_CAP_GET ## sz(bus_p->bus_cfg_hdl, 0, bus_p->bus_pcie_off, off)
 #define	PCIE_CAP_PUT(sz, bus_p, off, val) \
-	PCI_CAP_PUT ## sz(bus_p->bus_cfg_hdl, NULL, bus_p->bus_pcie_off, off, \
+	PCI_CAP_PUT ## sz(bus_p->bus_cfg_hdl, 0, bus_p->bus_pcie_off, off, \
 	    val)
 #define	PCIE_AER_GET(sz, bus_p, off) \
-	PCI_XCAP_GET ## sz(bus_p->bus_cfg_hdl, NULL, bus_p->bus_aer_off, off)
+	PCI_XCAP_GET ## sz(bus_p->bus_cfg_hdl, 0, bus_p->bus_aer_off, off)
 #define	PCIE_AER_PUT(sz, bus_p, off, val) \
-	PCI_XCAP_PUT ## sz(bus_p->bus_cfg_hdl, NULL, bus_p->bus_aer_off, off, \
+	PCI_XCAP_PUT ## sz(bus_p->bus_cfg_hdl, 0, bus_p->bus_aer_off, off, \
 	    val)
 #define	PCIX_CAP_GET(sz, bus_p, off) \
-	PCI_CAP_GET ## sz(bus_p->bus_cfg_hdl, NULL, bus_p->bus_pcix_off, off)
+	PCI_CAP_GET ## sz(bus_p->bus_cfg_hdl, 0, bus_p->bus_pcix_off, off)
 #define	PCIX_CAP_PUT(sz, bus_p, off, val) \
-	PCI_CAP_PUT ## sz(bus_p->bus_cfg_hdl, NULL, bus_p->bus_pcix_off, off, \
+	PCI_CAP_PUT ## sz(bus_p->bus_cfg_hdl, 0, bus_p->bus_pcix_off, off, \
 	    val)
 
 /* Translate PF error return values to DDI_FM values */
diff --git a/usr/src/uts/common/tnf/tnf.c b/usr/src/uts/common/tnf/tnf.c
index f814066723..d5aa17236f 100644
--- a/usr/src/uts/common/tnf/tnf.c
+++ b/usr/src/uts/common/tnf/tnf.c
@@ -110,7 +110,7 @@ static struct {
 	boolean_t	tnf_pidfilter_mode;
 	boolean_t	ctldev_is_open;
 	int		mapdev_open_count;
-	kmutex_t 	tnf_mtx;
+	kmutex_t	tnf_mtx;
 } tnf_drv_state = { 0, B_FALSE, B_FALSE, 0 };
 
 static int tnf_getmaxprobe(caddr_t, int);
@@ -244,9 +244,9 @@ tnf_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	if (cmd != DDI_ATTACH)
 		return (DDI_FAILURE);
 	if ((ddi_create_minor_node(devi, "tnfctl", S_IFCHR, TNFCTL_MINOR,
-	    DDI_PSEUDO, NULL) == DDI_FAILURE) ||
+	    DDI_PSEUDO, 0) == DDI_FAILURE) ||
 	    (ddi_create_minor_node(devi, "tnfmap", S_IFCHR, TNFMAP_MINOR,
-	    DDI_PSEUDO, NULL) == DDI_FAILURE)) {
+	    DDI_PSEUDO, 0) == DDI_FAILURE)) {
 		ddi_remove_minor_node(devi, NULL);
 		return (DDI_FAILURE);
 	}
@@ -379,7 +379,7 @@ tnf_mmap(dev_t dev, off_t off, int prot)
 /*ARGSUSED4*/
 static int
 tnf_ioctl(dev_t dev, int cmd, intptr_t arg, int mode,
-	cred_t *credp, int *rvalp)
+    cred_t *credp, int *rvalp)
 {
 	int filterval = 1;
 
diff --git a/usr/src/uts/i86pc/Makefile b/usr/src/uts/i86pc/Makefile
index 64ac810047..1638d050df 100644
--- a/usr/src/uts/i86pc/Makefile
+++ b/usr/src/uts/i86pc/Makefile
@@ -22,6 +22,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+#
 #	This makefile drives the production of all implementation architecture
 #	dependent modules for the i86pc architecture.
 #
@@ -31,23 +33,6 @@ UTSBASE = ..
 include Makefile.i86pc
 
 #
-#	The following are x86 specific (rather than i86pc) specific modules
-#	which are required for the i86pc kernel to completely lint. They are
-#	not involved in the build in any other way. In order to minimize
-#	build time, it is assumed that they are up to date.
-#
-INTEL_LIB_DIR	 = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR)
-
-INTEL_LINTS	 = genunix
-
-LINT_LIBS	 = \
-		   $(GENUNIX_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
-		   $(PARALLEL_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \
-		   $(INTEL_LINTS:%=$(INTEL_LIB_DIR)/llib-l%.ln)
-
-I86PC_LINTS =	dr drmach_acpi
-
-#
 #
 #
 def		:=	TARGET= def
@@ -56,12 +41,8 @@ install		:=	TARGET= install
 install_h	:=	TARGET= install_h
 clean		:=	TARGET= clean
 clobber		:=	TARGET= clobber
-lint		:=	TARGET= lint
-lintlib		:=	TARGET= lintlib
-machmodlintlib	:=	TARGET= modlintlib
 modlist		:=	TARGET= modlist
 modlist	modlist.intel :=	NO_STATE= -K $$MODSTATE$$$$
-clean.lint	:=	TARGET= clean.lint
 check		:=	TARGET= check
 
 .KEEP_STATE:
@@ -73,15 +54,12 @@ INITIAL_TARGETS = \
 	unix \
 	cpu/scripts
 
-def all clean clobber clean.lint: setup genassym unix .WAIT \
+def all clean clobber: setup genassym unix .WAIT \
 	$(KMODS) $(XMODS) $(IMPLEMENTATIONS)
 
 install: install_platforms setup genassym unix .WAIT \
 	$(KMODS) $(XMODS) $(IMPLEMENTATIONS)
 
-# Need to clean in here too because of lint.
-clean: $(I86PC_LINTS)
-
 # list the modules under i86pc.
 modlist: unix $(KMODS) $(XMODS) $(IMPLEMENTATIONS)
 
@@ -91,10 +69,6 @@ modlist.karch: modlist modlist.intel
 modlist.intel:
 	@cd $(SRC)/uts/intel; pwd; $(MAKE) $(NO_STATE) modlist
 
-lintlib:	unix
-
-modlintlib:	$(KMODS)
-
 genassym unix $(KMODS):	FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
@@ -130,24 +104,6 @@ install_platforms:	$(ROOT_PSM_DIR) $(USR_PSM_DIR) \
 			$(ROOT_PLAT_LINKS) $(USR_PLAT_LINKS) \
 			$(OEM_USR_PLAT_LINKS)
 
-#
-#	Full kernel lint target.
-#
-LINT_TARGET	= globallint
-
-# workaround for multiply defined errors
-globallint := LINTFLAGS += -erroff=E_NAME_MULTIPLY_DEF2
-
-globallint:
-	@-$(ECHO) "\nFULL KERNEL: global crosschecks:"
-	@-$(LINT) $(LINTFLAGS) $(LINT_LIB) $(LINT_LIBS) 2>&1 | $(LGREP.2)
-
-lint:	lintlib .WAIT modlintlib .WAIT $(INTEL_LINTS) $(LINT_DEPS) \
-	$(IMPLEMENTATIONS)
-
-$(INTEL_LINTS):	FRC
-	@cd $(UTSBASE)/intel/$@; pwd; $(MAKE) modlintlib
-
 include ../Makefile.targ
 
 #
diff --git a/usr/src/uts/i86pc/Makefile.files b/usr/src/uts/i86pc/Makefile.files
index 3979ddaef7..85579bcb57 100644
--- a/usr/src/uts/i86pc/Makefile.files
+++ b/usr/src/uts/i86pc/Makefile.files
@@ -24,6 +24,7 @@
 #
 # Copyright (c) 2010, Intel Corporation.
 # Copyright 2019 Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	This Makefile defines file modules in the directory uts/i86pc
 #	and its children. These are the source files which are i86pc
@@ -297,9 +298,7 @@ INC_PATH	+= -I$(UTSBASE)/i86xpv -I$(UTSBASE)/common/xen
 #
 # Since the assym files are derived, the dependencies must be explicit for
 # all files including this file. (This is only actually required in the
-# instance when the .nse_depinfo file does not exist.) It may seem that
-# the lint targets should also have a similar dependency, but they don't
-# since only C headers are included when #defined(__lint) is true.
+# instance when the .nse_depinfo file does not exist.)
 #
 
 ASSYM_DEPS      +=		\
diff --git a/usr/src/uts/i86pc/Makefile.i86pc b/usr/src/uts/i86pc/Makefile.i86pc
index 02d03c2373..228894ec6e 100644
--- a/usr/src/uts/i86pc/Makefile.i86pc
+++ b/usr/src/uts/i86pc/Makefile.i86pc
@@ -25,6 +25,7 @@
 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2013 Andrew Stormont.  All rights reserved.
 # Copyright 2017 Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #
 #	This makefile contains the common definitions for the i86pc unix
@@ -59,12 +60,6 @@ UNIX_DIR	 = $(UTSBASE)/$(PLATFORM)/unix
 GENLIB_DIR	 = $(UTSBASE)/intel/genunix
 MODSTUBS_DIR	 = $(UNIX_DIR)
 DSF_DIR		 = $(UTSBASE)/$(PLATFORM)/genassym
-LINTS_DIR	 = $(OBJS_DIR)
-LINT_LIB_DIR	 = $(UTSBASE)/$(PLATFORM)/lint-libs/$(OBJS_DIR)
-GEN_LINT_LIB_DIR = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR)
-
-LINT32_DIRS	 = $(LINT32_BUILDS:%=$(UTSBASE)/$(PLATFORM)/lint-libs/%)
-LINT32_FILES	 = $(LINT32_DIRS:%=%/llib-l$(MODULE).ln)
 
 DTRACESTUBS_O	 = $(OBJS_DIR)/dtracestubs.o
 DTRACESTUBS	 = $(OBJS_DIR)/libdtracestubs.so
@@ -73,10 +68,7 @@ SYM_MOD		= $(OBJS_DIR)/unix.sym
 
 UNIX_O		 = $(UNIX_DIR)/$(OBJS_DIR)/unix.o
 MODSTUBS_O	 = $(MODSTUBS_DIR)/$(OBJS_DIR)/modstubs.o
-GENLIB	 	 = $(GENLIB_DIR)/$(OBJS_DIR)/libgenunix.so
-LINT_LIB	 = $(LINT_LIB_DIR)/llib-lunix.ln
-DBOOT_LINT_LIB	 = $(LINT_LIB_DIR)/llib-ldboot.ln
-GEN_LINT_LIB	 = $(GEN_LINT_LIB_DIR)/llib-lgenunix.ln
+GENLIB		 = $(GENLIB_DIR)/$(OBJS_DIR)/libgenunix.so
 
 #
 #	Include the makefiles which define build rule templates, the
@@ -259,7 +251,7 @@ DRV_KMODS	+= npe
 DRV_KMODS	+= pci-ide
 DRV_KMODS	+= xsvc
 DRV_KMODS	+= tzmon
-DRV_KMODS	+= acpi_drv 
+DRV_KMODS	+= acpi_drv
 DRV_KMODS	+= acpinex
 DRV_KMODS	+= amd_iommu
 DRV_KMODS	+= dr
@@ -274,7 +266,7 @@ DRV_KMODS	+= cpudrv
 
 #
 # Platform Power Modules
-# 
+#
 DRV_KMODS	+= ppm acpippm
 
 #
@@ -325,7 +317,7 @@ DACF_KMODS	+= consconfig_dacf
 #
 #	'Mach' Modules (/kernel/mach):
 #
-MACH_KMODS     	+= uppc
+MACH_KMODS	+= uppc
 
 #
 #	CPR Misc Module.
diff --git a/usr/src/uts/i86pc/Makefile.rules b/usr/src/uts/i86pc/Makefile.rules
index 0e3ea556ea..95a84aa8ab 100644
--- a/usr/src/uts/i86pc/Makefile.rules
+++ b/usr/src/uts/i86pc/Makefile.rules
@@ -23,6 +23,7 @@
 # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 # Copyright 2017 Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 
 #	This Makefile defines the build rules for the directory uts/i86pc
@@ -260,14 +261,6 @@ DBOOT_AS_INCL	= $(AS_INC_PATH)
 
 DBOOT_AS	= $(ONBLD_TOOLS)/bin/$(MACH)/aw
 
-DBOOT_LINTS_DIR	= $(DBOOT_OBJS_DIR)
-DBOOT_LINTFLAGS_i86pc	= $(LINTFLAGS_i386_32) $(LINTTAGS_i386_32)
-
-DBOOT_LINTFLAGS = $(DBOOT_LINTFLAGS_$(PLATFORM)) $(LINTTAGS) $(C99LMODE) \
-	$(CPPFLAGS) $(DBOOT_DEFS)
-DBOOT_LOCAL_LINTFLAGS   = -c -dirout=$(DBOOT_LINTS_DIR) -I$(SRC)/common \
-	$(DBOOT_LINTFLAGS) $(DBOOT_LINTTAGS)
-
 $(DBOOT_OBJS_DIR)/%.o:		$(UTSBASE)/i86pc/boot/%.c
 	$(i386_CC) $(DBOOT_FLAGS) -O $(DBOOT_DEFS) $(DBOOT_CC_INCL) -c -o $@ $<
 
@@ -360,191 +353,3 @@ $(OBJS_DIR)/dtracestubs.s:	$(UNIX_O) $(LIBS)
 
 $(DTRACESTUBS):	$(DTRACESTUBS_O)
 	$(BUILD.SO) $(DTRACESTUBS_O)
-
-#
-#	Section 1b: Lint `object' build rules
-#
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/conf/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/cpu/amd_opteron/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/cpu/authenticamd/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/cpu/generic_cpu/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/cpu/genuineintel/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:              $(UTSBASE)/i86pc/io/acpi_drv/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/fipe/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/acpi/acpidev/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/acpi/acpinex/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/acpi/drmach_acpi/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:              $(UTSBASE)/i86pc/io/amd_iommu/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/dr/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/ioat/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/pci/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/pciex/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/intel/io/pciex/hotplug/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/pcplusmp/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/pcplusmp/%.s
-	@($(LHEAD) $(LINT.s) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/apix/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/apix/%.s
-	@($(LHEAD) $(LINT.s) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/ppm/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/ppm/%.s
-	@($(LHEAD) $(LINT.s) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/psm/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/psm/%.s
-	@($(LHEAD) $(LINT.s) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/tzmon/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/ml/%.s
-	@($(LHEAD) $(LINT.s) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/os/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/os/cpupm/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/boot/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/dboot/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/vm/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(SRC)/common/font/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/common/io/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/common/io/ppm/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/common/io/pciex/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/common/os/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(SRC)/common/dis/i386/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(SRC)/common/atomic/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/gfx_private/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/xsvc/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/common/xen/os/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/vmm/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/vmm/amd/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/vmm/intel/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/vmm/io/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/vmm/intel/%.s
-	@($(LHEAD) $(LINT.s) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/io/viona/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-#
-# bios call has a funky name change while building
-#
-$(LINTS_DIR)/bios_call.ln:	$(UTSBASE)/i86pc/ml/bios_call_src.s
-	@($(LHEAD) $(LINT.s) $(UTSBASE)/i86pc/ml/bios_call_src.s  $(LTAIL))
-	@mv $(LINTS_DIR)/bios_call_src.ln $(LINTS_DIR)/bios_call.ln
-
-#
-# So does fb_swtch
-#
-$(LINTS_DIR)/fb_swtch.ln:	$(UTSBASE)/i86pc/ml/fb_swtch_src.s
-	@($(LHEAD) $(LINT.s) $(UTSBASE)/i86pc/ml/fb_swtch_src.s  $(LTAIL))
-	@mv $(LINTS_DIR)/fb_swtch_src.ln $(LINTS_DIR)/fb_swtch.ln
-
-#
-# dboot always compiles in 32-bit mode, so force lint to be 32-bit mode too.
-#
-$(DBOOT_LINTS_DIR)/%.ln: $(UTSBASE)/i86pc/dboot/%.c
-	@($(LHEAD) $(DBOOT_LINT) $(DBOOT_LOCAL_LINTFLAGS) $< $(LTAIL))
-
-$(DBOOT_LINTS_DIR)/%.ln: $(UTSBASE)/i86pc/dboot/%.s
-	@($(LHEAD) $(DBOOT_LINT) $(DBOOT_LOCAL_LINTFLAGS) $< $(LTAIL))
-
-$(DBOOT_LINTS_DIR)/%.ln: $(DBOOT_LINTS_DIR)/%.c
-	@($(LHEAD) $(DBOOT_LINT) $(DBOOT_LOCAL_LINTFLAGS) $< $(LTAIL))
-
-$(DBOOT_LINTS_DIR)/%.ln: $(SRC)/common/font/%.c
-	@($(LHEAD) $(DBOOT_LINT) $(DBOOT_LOCAL_LINTFLAGS) $< $(LTAIL))
-
-$(DBOOT_LINTS_DIR)/%.ln: $(COMMONBASE)/crypto/sha1/%.c
-	@($(LHEAD) $(DBOOT_LINT) $(DBOOT_LOCAL_LINTFLAGS) $< $(LTAIL))
-
-$(DBOOT_LINTS_DIR)/%.ln: $(UTSBASE)/i86pc/boot/%.c
-	@($(LHEAD) $(DBOOT_LINT) $(DBOOT_LOCAL_LINTFLAGS) $< $(LTAIL))
-
-$(DBOOT_LINTS_DIR)/%.ln: $(COMMONBASE)/util/%.c
-	@($(LHEAD) $(DBOOT_LINT) $(DBOOT_LOCAL_LINTFLAGS) $< $(LTAIL))
-
-$(DBOOT_LINTS_DIR)/%.ln: $(COMMONBASE)/util/i386/%.s
-	@($(LHEAD) $(DBOOT_LINT) $(DBOOT_LOCAL_LINTFLAGS) $< $(LTAIL))
diff --git a/usr/src/uts/i86pc/acpi_drv/Makefile b/usr/src/uts/i86pc/acpi_drv/Makefile
index da499c485e..d5d60fdc72 100644
--- a/usr/src/uts/i86pc/acpi_drv/Makefile
+++ b/usr/src/uts/i86pc/acpi_drv/Makefile
@@ -24,9 +24,10 @@
 # Use is subject to license terms.
 #
 # Copyright (c) 2018, Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 
-#	This makefile drives the production of the acpi_drv 
+#	This makefile drives the production of the acpi_drv
 #	driver kernel module.
 #
 #	i86pc architecture dependent
@@ -40,9 +41,8 @@ UTSBASE	= ../..
 #
 #	Define the module and object file sets.
 #
-MODULE		= acpi_drv 
+MODULE		= acpi_drv
 OBJECTS		= $(ACPI_DRV_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(ACPI_DRV_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/i86pc/io/acpi_drv
 
@@ -55,7 +55,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY) $(CONFMOD)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 DEBUG_FLGS      =
@@ -71,13 +70,6 @@ $(OBJS_DIR)/acpi_video.o := SMOFF += all_func_returns
 LDFLAGS		+= -dy -N misc/acpica
 
 #
-# 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_BAD_PTR_CAST_ALIGN
-
-#
 #	Overrides
 #
 C99LMODE=	-Xc99=%all
@@ -95,12 +87,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/i86pc/acpidev/Makefile b/usr/src/uts/i86pc/acpidev/Makefile
index f910150ec6..f8d6280dc9 100644
--- a/usr/src/uts/i86pc/acpidev/Makefile
+++ b/usr/src/uts/i86pc/acpidev/Makefile
@@ -25,6 +25,7 @@
 # All rights reserved.
 #
 # Copyright (c) 2018, Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	This makefile drives the production of the ACPI device configuration
 #	kernel module.
@@ -42,7 +43,6 @@ UTSBASE	= ../..
 #
 MODULE		= acpidev
 OBJECTS		= $(ACPIDEV_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(ACPIDEV_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_MISC_DIR)/$(MODULE)
 
 #
@@ -54,7 +54,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 #
@@ -82,12 +81,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/i86pc/acpinex/Makefile b/usr/src/uts/i86pc/acpinex/Makefile
index 4f6354af69..c75f261397 100644
--- a/usr/src/uts/i86pc/acpinex/Makefile
+++ b/usr/src/uts/i86pc/acpinex/Makefile
@@ -25,6 +25,7 @@
 # All rights reserved.
 #
 # Copyright (c) 2018, Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	This makefile drives the production of the ACPI virtual nexus
 #	kernel module.
@@ -42,7 +43,6 @@ UTSBASE	= ../..
 #
 MODULE		= acpinex
 OBJECTS		= $(ACPINEX_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(ACPINEX_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 
 #
@@ -54,7 +54,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 #
@@ -80,12 +79,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/i86pc/acpippm/Makefile b/usr/src/uts/i86pc/acpippm/Makefile
index 0f08acc855..b3b194eb2a 100644
--- a/usr/src/uts/i86pc/acpippm/Makefile
+++ b/usr/src/uts/i86pc/acpippm/Makefile
@@ -25,6 +25,7 @@
 # Use is subject to license terms.
 # Copyright (c) 2011 Bayard G. Bell. All rights reserved.
 # Copyright 2016 Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	This makefile drives the production of the power managment
 #	module for the ACPI subsystem
@@ -42,7 +43,6 @@ UTSBASE	= ../..
 #
 MODULE		= acpippm
 OBJECTS		= $(ACPIPPM_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(ACPIPPM_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/i86pc/io
 INC_PATH	+= -I$(UTSBASE)/i86pc/sys/acpi
@@ -56,15 +56,11 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 $(OBJS_DIR)/acpippm.o :=	CERRWARN	+= -_gcc=-Wno-unused-function
 $(OBJS_DIR)/acpisleep.o :=	CERRWARN	+= -_gcc=-Wno-unused-function
 
-#
-# lint pass one enforcement
-#
 CFLAGS += $(CCVERBOSE)
 
 CERRWARN	+= -_gcc=-Wno-unused-variable
@@ -87,12 +83,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS) $(CONF_INSTALL_DEPS)
 
 #
diff --git a/usr/src/uts/i86pc/amd_iommu/Makefile b/usr/src/uts/i86pc/amd_iommu/Makefile
index b676a83fc2..225f0c1f77 100644
--- a/usr/src/uts/i86pc/amd_iommu/Makefile
+++ b/usr/src/uts/i86pc/amd_iommu/Makefile
@@ -22,6 +22,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2016 Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	This Makefile drives production of the amd_iommu driver kernel module.
 #
@@ -37,7 +38,6 @@ UTSBASE	= ../..
 #
 MODULE		= amd_iommu
 OBJECTS		= $(AMD_IOMMU_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(AMD_IOMMU_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 CONF_SRCDIR     = $(UTSBASE)/i86pc/io/amd_iommu
 
@@ -50,7 +50,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 #
@@ -75,12 +74,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS) $(CONF_INSTALL_DEPS)
 
 #
diff --git a/usr/src/uts/i86pc/amd_opteron/Makefile b/usr/src/uts/i86pc/amd_opteron/Makefile
index 911d5ebd71..4ccdac0523 100644
--- a/usr/src/uts/i86pc/amd_opteron/Makefile
+++ b/usr/src/uts/i86pc/amd_opteron/Makefile
@@ -21,6 +21,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2016 Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 
 #
@@ -34,7 +35,6 @@ UTSBASE = ../..
 MODULE		= cpu_ms.AuthenticAMD.15
 #
 OBJECTS		= $(CPU_AO_OBJS:%=$(OBJS_DIR)/%)
-LINTS           = $(CPU_AO_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE      = $(ROOT_PSM_CPU_DIR)/$(MODULE)
 
 SRCDIR		= ../cpu/amd_opteron
@@ -49,15 +49,9 @@ AO_GENDISP	= ../cpu/scripts/ao_gendisp
 include ../cpu/Makefile.cpu
 
 #
-#	Our lint library has a different name from that of the module we build.
-#
-LINT_MODULE	= amd_opteron
-
-#
 #       Define targets
 #
 ALL_TARGET      = $(BINARY)
-LINT_TARGET     = $(LINT_MODULE).lint
 INSTALL_TARGET  = $(BINARY) $(ROOTMODULE)
 
 #
@@ -82,12 +76,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/i86pc/apix/Makefile b/usr/src/uts/i86pc/apix/Makefile
index 83600c9286..9f791fe7ce 100644
--- a/usr/src/uts/i86pc/apix/Makefile
+++ b/usr/src/uts/i86pc/apix/Makefile
@@ -23,6 +23,7 @@
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2019, Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	This makefile drives the production of the apix "mach"
 #	kernel module.
@@ -40,7 +41,6 @@ UTSBASE	= ../..
 #
 MODULE		= apix
 OBJECTS		= $(APIX_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(APIX_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_MACH_DIR)/$(MODULE)
 
 #
@@ -52,7 +52,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 DEBUG_FLGS      =
@@ -79,12 +78,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/i86pc/authenticamd/Makefile b/usr/src/uts/i86pc/authenticamd/Makefile
index cfb17dcbae..6526cc528c 100644
--- a/usr/src/uts/i86pc/authenticamd/Makefile
+++ b/usr/src/uts/i86pc/authenticamd/Makefile
@@ -20,7 +20,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 
 #
@@ -34,7 +34,6 @@ UTSBASE = ../..
 MODULE		= cpu_ms.AuthenticAMD
 #
 OBJECTS		= $(CPU_AUTHAMD_OBJS:%=$(OBJS_DIR)/%)
-LINTS           = $(CPU_AUTHAMD_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE      = $(ROOT_PSM_CPU_DIR)/$(MODULE)
 
 SRCDIR		= ../cpu/authenticamd
@@ -44,16 +43,10 @@ SRCDIR		= ../cpu/authenticamd
 #
 include ../cpu/Makefile.cpu
 
-#
-#	Our lint library has a different name from that of the module we build.
-#
-LINT_MODULE	= authenticamd
 
-#
 #       Define targets
 #
 ALL_TARGET      = $(BINARY)
-LINT_TARGET     = $(LINT_MODULE).lint
 INSTALL_TARGET  = $(BINARY) $(ROOTMODULE)
 
 #
@@ -76,12 +69,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/i86pc/consconfig_dacf/Makefile b/usr/src/uts/i86pc/consconfig_dacf/Makefile
index a3ab02542e..ba283aafab 100644
--- a/usr/src/uts/i86pc/consconfig_dacf/Makefile
+++ b/usr/src/uts/i86pc/consconfig_dacf/Makefile
@@ -24,6 +24,8 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+#
 
 #
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
@@ -35,7 +37,6 @@ UTSBASE	= ../..
 #
 MODULE		= consconfig_dacf
 OBJECTS		= $(CONSCONFIG_DACF_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(CONSCONFIG_DACF_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DACF_DIR)/$(MODULE)
 
 #
@@ -47,7 +48,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #       Define targets
 #
 ALL_TARGET      = $(BINARY)
-LINT_TARGET     = $(MODULE).lint
 INSTALL_TARGET  = $(BINARY) $(ROOTMODULE)
 
 #
@@ -67,12 +67,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/i86pc/cpc/Makefile b/usr/src/uts/i86pc/cpc/Makefile
index 65efe4b49b..d1032d420a 100644
--- a/usr/src/uts/i86pc/cpc/Makefile
+++ b/usr/src/uts/i86pc/cpc/Makefile
@@ -23,7 +23,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	This makefile drives the production of the cpc kernel module.
 #
@@ -40,7 +40,6 @@ UTSBASE	= ../..
 #
 MODULE		= cpc
 OBJECTS		= $(CPC_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(CPC_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 ROOTLINK	= $(ROOT_PSM_SYS_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io
@@ -54,16 +53,9 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY) $(SRC_CONFFILE)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE)
 
 #
-# 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_ASSIGN_NARROW_CONV
-#
 #	Default build targets.
 #
 .KEEP_STATE:
@@ -76,12 +68,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 $(ROOTLINK):	$(ROOT_PSM_SYS_DIR) $(ROOTMODULE)
diff --git a/usr/src/uts/i86pc/cpr/Makefile b/usr/src/uts/i86pc/cpr/Makefile
index a1dd7e68ee..2ecad49a61 100644
--- a/usr/src/uts/i86pc/cpr/Makefile
+++ b/usr/src/uts/i86pc/cpr/Makefile
@@ -24,6 +24,7 @@
 # Use is subject to license terms.
 # Copyright (c) 2011 Bayard G. Bell. All rights reserved.
 # Copyright 2016, Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	This makefile drives the production of the cpr misc kernel module.
 #
@@ -44,9 +45,6 @@ MODULE		= cpr
 OBJECTS		= $(CPR_IMPL_OBJS:%=$(OBJS_DIR)/%) \
 		  $(CPR_OBJS:%=$(OBJS_DIR)/%) \
 		  $(CPR_INTEL_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(CPR_OBJS:%.o=$(LINTS_DIR)/%.ln) \
-		  $(CPR_IMPL_OBJS:%.o=$(LINTS_DIR)/%.ln) \
-		  $(CPR_INTEL_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_MISC_DIR)/$(MODULE)
 
 #
@@ -65,19 +63,15 @@ LDFLAGS		+= -dy -N misc/acpica -N misc/bootdev
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
-#
-# lint pass one enforcement
-#
 CFLAGS += $(CCVERBOSE)
 
 CERRWARN	+= -_gcc=-Wno-unused-variable
 CERRWARN	+= -_gcc=-Wno-unused-label
 CERRWARN	+= -_gcc=-Wno-uninitialized
 CERRWARN	+= -_gcc=-Wno-parentheses
-$(OBJS_DIR)/cpr_impl.o := 	CERRWARN	+= -_gcc=-Wno-unused-function
+$(OBJS_DIR)/cpr_impl.o :=	CERRWARN	+= -_gcc=-Wno-unused-function
 
 #
 #	Default build targets.
@@ -92,12 +86,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/i86pc/cpudrv/Makefile b/usr/src/uts/i86pc/cpudrv/Makefile
index 73f67a9971..590f8704bc 100644
--- a/usr/src/uts/i86pc/cpudrv/Makefile
+++ b/usr/src/uts/i86pc/cpudrv/Makefile
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2016, Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	This makefile drives the production of the cpu driver
 #	kernel module.
@@ -36,7 +37,6 @@ UTSBASE	= ../..
 #
 MODULE		= cpudrv
 OBJECTS		= $(CPUDRV_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(CPUDRV_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 
 #
@@ -48,12 +48,8 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
-#
-# lint pass one enforcement
-#
 CFLAGS += $(CCVERBOSE)
 
 CERRWARN	+= -_gcc=-Wno-uninitialized
@@ -78,12 +74,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/i86pc/dr/Makefile b/usr/src/uts/i86pc/dr/Makefile
index 90d07cf914..d91a421993 100644
--- a/usr/src/uts/i86pc/dr/Makefile
+++ b/usr/src/uts/i86pc/dr/Makefile
@@ -26,6 +26,7 @@
 # All rights reserved.
 #
 # Copyright (c) 2018, Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 
 #
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
@@ -38,7 +39,6 @@ PLATFORM = i86pc
 #
 MODULE		= dr
 OBJECTS		= $(DR_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(DR_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/i86pc/io/dr
 
@@ -51,7 +51,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 #
@@ -60,9 +59,6 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 DEF_BUILDS	= $(DEF_BUILDS64)
 ALL_BUILDS	= $(ALL_BUILDS64)
 
-#
-# lint pass one enforcement
-#
 CFLAGS += $(CCVERBOSE)
 
 CERRWARN += -_gcc=-Wno-parentheses
@@ -76,7 +72,7 @@ SMOFF += index_overflow
 # module dependencies
 #
 LDFLAGS += -dy -Nmisc/drmach_acpi
- 
+
 CLEANFILES +=	$(DR_GENERR)
 CLEANFILES +=	$(DR_IO)/dr_err.c
 
@@ -93,12 +89,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS) $(CONF_INSTALL_DEPS)
 
 #
diff --git a/usr/src/uts/i86pc/drmach_acpi/Makefile b/usr/src/uts/i86pc/drmach_acpi/Makefile
index 1b4b688df7..4aa595e4ad 100644
--- a/usr/src/uts/i86pc/drmach_acpi/Makefile
+++ b/usr/src/uts/i86pc/drmach_acpi/Makefile
@@ -26,6 +26,7 @@
 # All rights reserved.
 #
 # Copyright 2016 Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	This makefile drives the production of the drmach_acpi loadable module.
 #
@@ -42,7 +43,6 @@ UTSBASE	= ../..
 #
 MODULE		= drmach_acpi
 OBJECTS		= $(DRMACH_ACPI_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(DRMACH_ACPI_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_MISC_DIR)/$(MODULE)
 
 #
@@ -54,7 +54,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 #
@@ -65,9 +64,6 @@ ALL_BUILDS	= $(ALL_BUILDS64)
 
 $(OBJS_DIR)/drmach_acpi.o :=	CERRWARN	+= -_gcc=-Wno-unused-function
 
-#
-# lint pass one enforcement
-#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -91,12 +87,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/i86pc/fipe/Makefile b/usr/src/uts/i86pc/fipe/Makefile
index ca933cf4f7..d0fd9e47fd 100644
--- a/usr/src/uts/i86pc/fipe/Makefile
+++ b/usr/src/uts/i86pc/fipe/Makefile
@@ -22,6 +22,8 @@
 # Copyright (c) 2009, Intel Corporation.
 # All rights reserved.
 #
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+#
 
 #	This makefile drives the production of the fipe
 #	driver kernel module.
@@ -39,7 +41,6 @@ UTSBASE	= ../..
 #
 MODULE		= fipe
 OBJECTS		= $(FIPE_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(FIPE_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/i86pc/io/fipe
 
@@ -52,16 +53,13 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY) $(SRC_CONFFILE)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 #
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
+# For now, disable these checks; maintainers should endeavor
+# to investigate and remove these for maximum coverage.
 # Please do not carry these forward to new Makefiles.
 #
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-
 CERRWARN	+= -_gcc=-Wno-type-limits
 
 #
@@ -82,12 +80,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/i86pc/genassym/Makefile b/usr/src/uts/i86pc/genassym/Makefile
index 0f2ab219ef..a9849ef550 100644
--- a/usr/src/uts/i86pc/genassym/Makefile
+++ b/usr/src/uts/i86pc/genassym/Makefile
@@ -22,6 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	This makefile drives the production of assym.h through
 #	compile time intialized data.
@@ -73,8 +74,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-clean.lint:
-
 install:	def
 
 CPPFLAGS += -I../../i86pc/io/ppm
diff --git a/usr/src/uts/i86pc/generic_cpu/Makefile b/usr/src/uts/i86pc/generic_cpu/Makefile
index 787402f588..d474c3a9da 100644
--- a/usr/src/uts/i86pc/generic_cpu/Makefile
+++ b/usr/src/uts/i86pc/generic_cpu/Makefile
@@ -20,6 +20,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+#
 
 #
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
@@ -33,7 +35,6 @@ MODULE		= cpu.generic
 #
 OBJECTS		= $(CPU_GCPU_OBJS:%=$(OBJS_DIR)/%)
 OBJECTS		+= $(CPU_GCPU_NTV_OBJS:%=$(OBJS_DIR)/%)
-LINTS           = $(CPU_GCPU_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE      = $(ROOT_PSM_CPU_DIR)/$(MODULE)
 
 #
@@ -45,15 +46,9 @@ CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-uninitialized
 
 #
-#	Our lint library has a different name from that of the module we build.
-#
-LINT_MODULE	= generic_cpu
-
-#
 #       Define targets
 #
 ALL_TARGET      = $(BINARY)
-LINT_TARGET     = $(LINT_MODULE).lint
 INSTALL_TARGET  = $(BINARY) $(ROOTMODULE)
 
 #
@@ -69,12 +64,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/i86pc/genuineintel/Makefile b/usr/src/uts/i86pc/genuineintel/Makefile
index 717eff899f..8639ef8eac 100644
--- a/usr/src/uts/i86pc/genuineintel/Makefile
+++ b/usr/src/uts/i86pc/genuineintel/Makefile
@@ -20,7 +20,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 
 #
@@ -34,7 +34,6 @@ UTSBASE = ../..
 MODULE		= cpu_ms.GenuineIntel
 #
 OBJECTS		= $(CPU_GENINTEL_OBJS:%=$(OBJS_DIR)/%)
-LINTS           = $(CPU_GENINTEL_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE      = $(ROOT_PSM_CPU_DIR)/$(MODULE)
 
 SRCDIR		= ../cpu/genuineintel
@@ -45,15 +44,9 @@ SRCDIR		= ../cpu/genuineintel
 include ../cpu/Makefile.cpu
 
 #
-#	Our lint library has a different name from that of the module we build.
-#
-LINT_MODULE	= genuineintel
-
-#
 #       Define targets
 #
 ALL_TARGET      = $(BINARY)
-LINT_TARGET     = $(LINT_MODULE).lint
 INSTALL_TARGET  = $(BINARY) $(ROOTMODULE)
 
 #
@@ -76,12 +69,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/i86pc/gfx_private/Makefile b/usr/src/uts/i86pc/gfx_private/Makefile
index a4c82da1bf..f3f654c9d6 100644
--- a/usr/src/uts/i86pc/gfx_private/Makefile
+++ b/usr/src/uts/i86pc/gfx_private/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 
 #
@@ -39,7 +40,6 @@ UTSBASE	= ../..
 #
 MODULE		= gfx_private
 OBJECTS		= $(GFX_PRIVATE_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(GFX_PRIVATE_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_MISC_DIR)/$(MODULE)
 GFXP_VGATEXT	= gfxp_vgatext
 GFXP_VGATEXT_SRC	= $(UTSBASE)/i86pc/io/gfx_private
@@ -58,18 +58,13 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 #
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
+# For now, disable these checks; maintainers should endeavor
+# to investigate and remove these for maximum coverage.
 # Please do not carry these forward to new Makefiles.
 #
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-LINTTAGS	+= -erroff=E_STATIC_UNUSED
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-
 CERRWARN	+= -_gcc=-Wno-uninitialized
 CERRWARN	+= -_gcc=-Wno-parentheses
 
@@ -86,12 +81,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/i86pc/i86hvm/Makefile b/usr/src/uts/i86pc/i86hvm/Makefile
index 07de533f70..43f84173a9 100644
--- a/usr/src/uts/i86pc/i86hvm/Makefile
+++ b/usr/src/uts/i86pc/i86hvm/Makefile
@@ -23,7 +23,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	This makefile drives the production of the i86hvm platform modules.
 #
@@ -46,12 +46,8 @@ install		:=	TARGET= install
 install_h	:=	TARGET= install_h
 clean		:=	TARGET= clean
 clobber		:=	TARGET= clobber
-lint		:=	TARGET= lint
-lintlib		:=	TARGET= lintlib
-modlintlib	:=	TARGET= modlintlib
 modlist		:=	TARGET= modlist
 modlist		:=	NO_STATE= -K $$MODSTATE$$$$
-clean.lint	:=	TARGET= clean.lint
 check		:=	TARGET= check
 
 #
@@ -61,7 +57,7 @@ check		:=	TARGET= check
 
 .PARALLEL: $(HVM_KMODS)
 
-def all clean clobber clean.lint modlist modlintlib:	$(HVM_KMODS)
+def all clean clobber modlist:	$(HVM_KMODS)
 
 install: install_implementations .WAIT \
 	$(HVM_KMODS)
@@ -77,31 +73,6 @@ $(HVM_KMODS):	FRC
 
 install_h check:	FRC
 
-lintlib lint:	modlintlib .WAIT $(LINT_DEPS)
-
-#
-# The 'lint.platmod' target lints the i86hvm platform modules against the i86pc
-# kernel.  This ends up doing all the kernel cross-checks.
-#
-LINT_TARGET	= lint.platmod
-INTEL_LIB_DIR	= $(UTSBASE)/intel/lint-libs/$(OBJS_DIR)
-INTEL_LINTS	= genunix
-LINT_LIBS	= $(LINT_LIB) \
-		  -L$(HVM_LINT_LIB_DIR) \
-		  -L$(LINT_LIB_DIR) \
-			$(GENUNIX_KMODS:%=-l%) \
-			$(PARALLEL_KMODS:%=-l%) \
-			$(CLOSED_KMODS:%=-l%) \
-		  -L$(INTEL_LIB_DIR) \
-			$(INTEL_LINTS:%=-l%)
-
-# workaround for multiply defined errors
-lint.platmod := LINTFLAGS += -erroff=E_NAME_MULTIPLY_DEF2
-
-lint.platmod:   modlintlib
-	@-$(ECHO) "\ni86hvm platform-dependent module: global crosschecks:"
-	@-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2)
-
 #
 #	Include common targets.
 #
diff --git a/usr/src/uts/i86pc/i86hvm/Makefile.i86hvm b/usr/src/uts/i86pc/i86hvm/Makefile.i86hvm
index 18b0397f70..5fe2b6c116 100644
--- a/usr/src/uts/i86pc/i86hvm/Makefile.i86hvm
+++ b/usr/src/uts/i86pc/i86hvm/Makefile.i86hvm
@@ -24,6 +24,7 @@
 # Use is subject to license terms.
 #
 # Copyright (c) 2018, Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 
 ROOT_HVM_DIR		= $(ROOT_PLAT_DIR)/i86hvm
 ROOT_HVM_MOD_DIR	= $(ROOT_HVM_DIR)/kernel
@@ -35,8 +36,6 @@ ROOT_HVM_MISC_DIR_64	= $(ROOT_HVM_MOD_DIR)/misc/$(MACH64)
 ROOT_HVM_MISC_DIR	= $(ROOT_HVM_MISC_DIR_$(CLASS))
 USR_HVM_DIR		= $(USR_PLAT_DIR)/i86hvm
 
-HVM_LINT_LIB_DIR= $(UTSBASE)/$(PLATFORM)/i86hvm/lint-libs/$(OBJS_DIR)
-
 #
 #       Define modules.
 #
@@ -50,9 +49,6 @@ include $(UTSBASE)/i86pc/i86hvm/Makefile.files
 #
 include $(UTSBASE)/i86pc/Makefile.i86pc
 
-LINTS_DIR	= $(OBJS_DIR)
-LINT_LIB_DIR	= $(UTSBASE)/$(PLATFORM)/lint-libs/$(OBJS_DIR)
-
 #
 # Indicate that we are building for the i86hvm semi-platform.
 # Also use Solaris specific code in xen public header files.
diff --git a/usr/src/uts/i86pc/i86hvm/Makefile.rules b/usr/src/uts/i86pc/i86hvm/Makefile.rules
index 4a9c0edec8..6e21b68714 100644
--- a/usr/src/uts/i86pc/i86hvm/Makefile.rules
+++ b/usr/src/uts/i86pc/i86hvm/Makefile.rules
@@ -21,8 +21,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 
 #
 #	This Makefile defines the build rules for the directory
@@ -55,19 +54,3 @@ $(OBJS_DIR)/%.o:		$(UTSBASE)/common/xen/io/%.c
 $(OBJS_DIR)/%.o:		$(UTSBASE)/common/xen/os/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
-
-#
-#	Section 1b: Lint `object' build rules
-#
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/i86hvm/io/xpv/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/i86pc/i86hvm/io/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/common/xen/io/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/common/xen/os/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
diff --git a/usr/src/uts/i86pc/i86hvm/cmdk/Makefile b/usr/src/uts/i86pc/i86hvm/cmdk/Makefile
index 3f07c0cb82..1c04b1b8f4 100644
--- a/usr/src/uts/i86pc/i86hvm/cmdk/Makefile
+++ b/usr/src/uts/i86pc/i86hvm/cmdk/Makefile
@@ -23,20 +23,17 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 
 UTSBASE=	$(SRC)/uts
 
 MODULE=		cmdk
 OBJECTS=	$(PV_CMDK_OBJS:%=$(OBJS_DIR)/%)
-LINTS=		$(PV_CMDK_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE=	$(ROOT_HVM_DRV_DIR)/$(MODULE)
 
 include		$(UTSBASE)/i86pc/i86hvm/Makefile.i86hvm
 
-LINT_MODULE=	pv_cmdk
-
 ALL_TARGET=	$(BINARY)
-LINT_TARGET=	$(LINT_MODULE).lint
 INSTALL_TARGET=	$(BINARY) $(ROOTMODULE)
 
 LDFLAGS +=	-dy
@@ -51,12 +48,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 include		$(UTSBASE)/i86pc/i86hvm/Makefile.targ
diff --git a/usr/src/uts/i86pc/i86hvm/hvm_bootstrap/Makefile b/usr/src/uts/i86pc/i86hvm/hvm_bootstrap/Makefile
index ea250a88a7..1b1b45cbb9 100644
--- a/usr/src/uts/i86pc/i86hvm/hvm_bootstrap/Makefile
+++ b/usr/src/uts/i86pc/i86hvm/hvm_bootstrap/Makefile
@@ -25,7 +25,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	i86pc architecture dependent
 #
@@ -38,7 +38,6 @@ UTSBASE	= ../../..
 #
 MODULE		= hvm_bootstrap
 OBJECTS		= $(HVM_BOOTSTRAP_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(HVM_BOOTSTRAP_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_HVM_MISC_DIR)/$(MODULE)
 
 #
@@ -50,7 +49,6 @@ include $(UTSBASE)/i86pc/i86hvm/Makefile.i86hvm
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 # Overrides
@@ -69,12 +67,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/i86pc/i86hvm/rtls/Makefile b/usr/src/uts/i86pc/i86hvm/rtls/Makefile
index 6c8a29ede0..fe696e4ee1 100644
--- a/usr/src/uts/i86pc/i86hvm/rtls/Makefile
+++ b/usr/src/uts/i86pc/i86hvm/rtls/Makefile
@@ -23,20 +23,18 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+#
 
 UTSBASE=	$(SRC)/uts
 
 MODULE=		rtls
 OBJECTS=	$(PV_RTLS_OBJS:%=$(OBJS_DIR)/%)
-LINTS=		$(PV_RTLS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE=	$(ROOT_HVM_DRV_DIR)/$(MODULE)
 
 include		$(UTSBASE)/i86pc/i86hvm/Makefile.i86hvm
 
-LINT_MODULE=	pv_rtls
-
 ALL_TARGET=	$(BINARY)
-LINT_TARGET=	$(LINT_MODULE).lint
 INSTALL_TARGET=	$(BINARY) $(ROOTMODULE)
 
 LDFLAGS +=	-dy
@@ -51,12 +49,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 include		$(UTSBASE)/i86pc/i86hvm/Makefile.targ
diff --git a/usr/src/uts/i86pc/i86hvm/xdf/Makefile b/usr/src/uts/i86pc/i86hvm/xdf/Makefile
index 61c773f5b3..c5fbc92adf 100644
--- a/usr/src/uts/i86pc/i86hvm/xdf/Makefile
+++ b/usr/src/uts/i86pc/i86hvm/xdf/Makefile
@@ -25,6 +25,8 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+#
 #	i86pc architecture dependent
 #
 #
@@ -37,7 +39,6 @@ UTSBASE	= ../../..
 #
 MODULE		= xdf
 OBJECTS		= $(XDF_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(XDF_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_HVM_DRV_DIR)/$(MODULE)
 
 #
@@ -49,17 +50,12 @@ include $(UTSBASE)/i86pc/i86hvm/Makefile.i86hvm
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 # Overrides
 CPPFLAGS	+= -DHVMPV_XDF_VERS=2
 LDFLAGS		+= -dy -Nmisc/cmlb -Ndrv/xpvd -Ndrv/xpv
 
-LINTTAGS	+= -erroff=E_SUSPICIOUS_COMPARISON
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-unused-label
 CERRWARN	+= -_gcc=-Wno-switch
@@ -77,12 +73,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/i86pc/i86hvm/xnf/Makefile b/usr/src/uts/i86pc/i86hvm/xnf/Makefile
index 683572496f..54de6febef 100644
--- a/usr/src/uts/i86pc/i86hvm/xnf/Makefile
+++ b/usr/src/uts/i86pc/i86hvm/xnf/Makefile
@@ -25,7 +25,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	This makefile drives the production of the xve
 #	network driver kernel module.
@@ -43,7 +43,6 @@ UTSBASE	= ../../..
 #
 MODULE		= xnf
 OBJECTS		= $(XNF_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(XNF_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_HVM_DRV_DIR)/$(MODULE)
 
 #
@@ -55,7 +54,6 @@ include $(UTSBASE)/i86pc/i86hvm/Makefile.i86hvm
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 #
@@ -64,10 +62,6 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 CPPFLAGS	+= -DHVMPV_XNF_VERS=1
 LDFLAGS		+= -dy -Nmisc/mac -Ndrv/ip -Ndrv/xpvd -Ndrv/xpv
 
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-LINTTAGS	+= -erroff=E_PTRDIFF_OVERFLOW
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-
 #
 #	Default build targets.
 #
@@ -81,12 +75,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/i86pc/i86hvm/xpv/Makefile b/usr/src/uts/i86pc/i86hvm/xpv/Makefile
index ed2453b9c5..8f55f8c9a4 100644
--- a/usr/src/uts/i86pc/i86hvm/xpv/Makefile
+++ b/usr/src/uts/i86pc/i86hvm/xpv/Makefile
@@ -24,6 +24,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+#
 
 #
 #	This makefile drives the production of the xpv
@@ -43,7 +45,6 @@ UTSBASE	= ../../..
 #
 MODULE		= xpv
 OBJECTS		= $(XPV_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(XPV_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_HVM_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/i86pc/i86hvm/io/xpv
 
@@ -56,21 +57,11 @@ include $(UTSBASE)/i86pc/i86hvm/Makefile.i86hvm
 #	Define targets
 #
 ALL_TARGET	= $(BINARY) $(CONFMOD)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 CPPFLAGS	+= -DHVMPV_XPV_VERS=1
 LDFLAGS		+= -dy -N mach/pcplusmp
 
-#
-# The Xen header files do not lint cleanly.  Since the troublesome
-# structures form part of the externally defined interface to the
-# hypervisor, we're stuck with the noise.
-#
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-LINTTAGS	+= -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-
 CERRWARN	+= -_gcc=-Wno-unused-label
 
 #
@@ -86,12 +77,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/i86pc/i86hvm/xpvd/Makefile b/usr/src/uts/i86pc/i86hvm/xpvd/Makefile
index 38e6406a5b..9766da5078 100644
--- a/usr/src/uts/i86pc/i86hvm/xpvd/Makefile
+++ b/usr/src/uts/i86pc/i86hvm/xpvd/Makefile
@@ -23,6 +23,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+#
 
 #
 #	This makefile drives the production of the xpvd nexus driver
@@ -40,7 +42,6 @@ UTSBASE	= ../../..
 #
 MODULE		= xpvd
 OBJECTS		= $(XPVD_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(XPVD_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_HVM_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/xen/io
 
@@ -53,16 +54,11 @@ include $(UTSBASE)/i86pc/i86hvm/Makefile.i86hvm
 #	Define targets
 #
 ALL_TARGET	= $(BINARY) $(CONFMOD)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 CPPFLAGS	+= -DHVMPV_XPVD_VERS=1
 LDFLAGS		+= -dy -Ndrv/xpv
 
-LINTTAGS	+= -erroff=E_STATIC_UNUSED
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-
 CERRWARN	+= -_gcc=-Wno-uninitialized
 
 #
@@ -78,12 +74,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/i86pc/ioat/Makefile b/usr/src/uts/i86pc/ioat/Makefile
index 5fa80da055..f73619635c 100644
--- a/usr/src/uts/i86pc/ioat/Makefile
+++ b/usr/src/uts/i86pc/ioat/Makefile
@@ -24,6 +24,8 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+#
 
 #
 #	This makefile drives the production of the ioat driver kernel
@@ -40,7 +42,6 @@ UTSBASE	= ../..
 #
 MODULE		= ioat
 OBJECTS		= $(IOAT_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(IOAT_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 CONF_SRCDIR     = $(UTSBASE)/i86pc/io/ioat
 
@@ -53,11 +54,8 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-
 CERRWARN	+= -_gcc=-Wno-unused-label
 CERRWARN	+= -_gcc=-Wno-uninitialized
 
@@ -85,12 +83,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/i86pc/isa/Makefile b/usr/src/uts/i86pc/isa/Makefile
index 40412e11b9..fc703c7090 100644
--- a/usr/src/uts/i86pc/isa/Makefile
+++ b/usr/src/uts/i86pc/isa/Makefile
@@ -24,6 +24,7 @@
 # Use is subject to license terms.
 #
 # Copyright (c) 2018, Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	This makefile drives the production of the ISA nexus driver
 #
@@ -40,7 +41,6 @@ UTSBASE	= ../..
 #
 MODULE		= isa
 OBJECTS		= $(ISANEXUS_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(ISANEXUS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 INC_PATH        += -I$(UTSBASE)/i86pc/sys/acpi
 
@@ -53,7 +53,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 $(OBJS_DIR)/isa.o :=	CERRWARN	+= -_gcc=-Wno-unused-function
@@ -61,9 +60,6 @@ $(OBJS_DIR)/isa.o :=	CERRWARN	+= -_gcc=-Wno-unused-function
 # needs work
 $(OBJS_DIR)/i8237A.o := SMOFF += indenting
 
-#
-# lint pass one enforcement
-#
 CFLAGS += $(CCVERBOSE)
 
 #
@@ -73,45 +69,43 @@ LDFLAGS         += -dy -Nmisc/acpica -Nmisc/busra -Nmisc/pci_autoconfig
 #
 # Define our version of dma_engine and i8237A interfaces
 #
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Di_dmae_init=$(MODULE)_i_dmae_init
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Di_dmae_acquire=$(MODULE)_i_dmae_acquire
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Di_dmae_free=$(MODULE)_i_dmae_free
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Di_dmae_get_best_mode=$(MODULE)_i_dmae_get_best_mode
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -D_dmae_nxcookie=$(MODULE)__dmae_nxcookie
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Di_dmae_prog=$(MODULE)_i_dmae_prog
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Di_dmae_swsetup=$(MODULE)_i_dmae_swsetup
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Di_dmae_swsetup=$(MODULE)_i_dmae_swsetup
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Di_dmae_swstart=$(MODULE)_i_dmae_swstart
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Di_dmae_stop=$(MODULE)_i_dmae_stop
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Di_dmae_enable=$(MODULE)_i_dmae_enable
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Di_dmae_disable=$(MODULE)_i_dmae_disable
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Di_dmae_get_chan_stat=$(MODULE)_i_dmae_get_chan_stat
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_init=$(MODULE)_d37A_init
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_dma_valid=$(MODULE)_d37A_dma_valid
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_dma_release=$(MODULE)_d37A_dma_release
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_dma_disable=$(MODULE)_d37A_dma_disable
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_dma_enable=$(MODULE)_d37A_dma_enable
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_get_best_mode=$(MODULE)_d37A_get_best_mode
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_intr=$(MODULE)_d37A_intr
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -DdEISA_setchain=$(MODULE)_dEISA_setchain
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_prog_chan=$(MODULE)_d37A_prog_chan
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_dma_swsetup=$(MODULE)_d37A_dma_swsetup
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_dma_swstart=$(MODULE)_d37A_dma_swstart
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_dma_stop=$(MODULE)_d37A_dma_stop
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_get_chan_stat=$(MODULE)_d37A_get_chan_stat
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_set_mode=$(MODULE)_d37A_set_mode
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_write_addr=$(MODULE)_d37A_write_addr
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_read_addr=$(MODULE)_d37A_read_addr
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_write_count=$(MODULE)_d37A_write_count
-$(OBJECTS) $(LINTS)	:= CPPFLAGS += -Dd37A_read_count=$(MODULE)_d37A_read_count
-
-#
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
+$(OBJECTS) := CPPFLAGS += -Di_dmae_init=$(MODULE)_i_dmae_init
+$(OBJECTS) := CPPFLAGS += -Di_dmae_acquire=$(MODULE)_i_dmae_acquire
+$(OBJECTS) := CPPFLAGS += -Di_dmae_free=$(MODULE)_i_dmae_free
+$(OBJECTS) := CPPFLAGS += -Di_dmae_get_best_mode=$(MODULE)_i_dmae_get_best_mode
+$(OBJECTS) := CPPFLAGS += -D_dmae_nxcookie=$(MODULE)__dmae_nxcookie
+$(OBJECTS) := CPPFLAGS += -Di_dmae_prog=$(MODULE)_i_dmae_prog
+$(OBJECTS) := CPPFLAGS += -Di_dmae_swsetup=$(MODULE)_i_dmae_swsetup
+$(OBJECTS) := CPPFLAGS += -Di_dmae_swsetup=$(MODULE)_i_dmae_swsetup
+$(OBJECTS) := CPPFLAGS += -Di_dmae_swstart=$(MODULE)_i_dmae_swstart
+$(OBJECTS) := CPPFLAGS += -Di_dmae_stop=$(MODULE)_i_dmae_stop
+$(OBJECTS) := CPPFLAGS += -Di_dmae_enable=$(MODULE)_i_dmae_enable
+$(OBJECTS) := CPPFLAGS += -Di_dmae_disable=$(MODULE)_i_dmae_disable
+$(OBJECTS) := CPPFLAGS += -Di_dmae_get_chan_stat=$(MODULE)_i_dmae_get_chan_stat
+$(OBJECTS) := CPPFLAGS += -Dd37A_init=$(MODULE)_d37A_init
+$(OBJECTS) := CPPFLAGS += -Dd37A_dma_valid=$(MODULE)_d37A_dma_valid
+$(OBJECTS) := CPPFLAGS += -Dd37A_dma_release=$(MODULE)_d37A_dma_release
+$(OBJECTS) := CPPFLAGS += -Dd37A_dma_disable=$(MODULE)_d37A_dma_disable
+$(OBJECTS) := CPPFLAGS += -Dd37A_dma_enable=$(MODULE)_d37A_dma_enable
+$(OBJECTS) := CPPFLAGS += -Dd37A_get_best_mode=$(MODULE)_d37A_get_best_mode
+$(OBJECTS) := CPPFLAGS += -Dd37A_intr=$(MODULE)_d37A_intr
+$(OBJECTS) := CPPFLAGS += -DdEISA_setchain=$(MODULE)_dEISA_setchain
+$(OBJECTS) := CPPFLAGS += -Dd37A_prog_chan=$(MODULE)_d37A_prog_chan
+$(OBJECTS) := CPPFLAGS += -Dd37A_dma_swsetup=$(MODULE)_d37A_dma_swsetup
+$(OBJECTS) := CPPFLAGS += -Dd37A_dma_swstart=$(MODULE)_d37A_dma_swstart
+$(OBJECTS) := CPPFLAGS += -Dd37A_dma_stop=$(MODULE)_d37A_dma_stop
+$(OBJECTS) := CPPFLAGS += -Dd37A_get_chan_stat=$(MODULE)_d37A_get_chan_stat
+$(OBJECTS) := CPPFLAGS += -Dd37A_set_mode=$(MODULE)_d37A_set_mode
+$(OBJECTS) := CPPFLAGS += -Dd37A_write_addr=$(MODULE)_d37A_write_addr
+$(OBJECTS) := CPPFLAGS += -Dd37A_read_addr=$(MODULE)_d37A_read_addr
+$(OBJECTS) := CPPFLAGS += -Dd37A_write_count=$(MODULE)_d37A_write_count
+$(OBJECTS) := CPPFLAGS += -Dd37A_read_count=$(MODULE)_d37A_read_count
+
+#
+# For now, disable these checks; maintainers should endeavor
+# to investigate and remove these for maximum coverage.
 # Please do not carry these forward to new Makefiles.
 #
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-
 CERRWARN	+= -_gcc=-Wno-unused-variable
 
 #
@@ -127,12 +121,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/i86pc/npe/Makefile b/usr/src/uts/i86pc/npe/Makefile
index c431ce7d75..a5a66a00f8 100644
--- a/usr/src/uts/i86pc/npe/Makefile
+++ b/usr/src/uts/i86pc/npe/Makefile
@@ -25,6 +25,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2016 Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	This makefile drives the production of the PCI-E nexus driver
 #
@@ -41,7 +42,6 @@ UTSBASE	= ../..
 #
 MODULE		= npe
 OBJECTS		= $(PCI_E_NEXUS_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(PCI_E_NEXUS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 
 #
@@ -53,7 +53,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 #
@@ -70,16 +69,12 @@ LDFLAGS	+= -dy -Nmisc/acpica -Nmisc/pcie
 # PCI/PCI-express nexi
 #
 CFLAGS		+= -D_MODULE_NAME="\"$(MODULE)\""
-LINTFLAGS	+= -D_MODULE_NAME="\"$(MODULE)\""
 
 #
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
+# For now, disable these checks; maintainers should endeavor
+# to investigate and remove these for maximum coverage.
 # Please do not carry these forward to new Makefiles.
 #
-LINTTAGS	+= -erroff=E_SUSPICIOUS_COMPARISON
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-
 CERRWARN	+= -_gcc=-Wno-uninitialized
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-unused-function
@@ -97,12 +92,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/i86pc/pci-ide/Makefile b/usr/src/uts/i86pc/pci-ide/Makefile
index 399ccc95e5..6be895d36c 100644
--- a/usr/src/uts/i86pc/pci-ide/Makefile
+++ b/usr/src/uts/i86pc/pci-ide/Makefile
@@ -26,6 +26,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2016 Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 
 #
@@ -45,7 +46,6 @@ UTSBASE	= ../..
 #
 MODULE		= pci-ide
 OBJECTS		= $(PCIIDE_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(PCIIDE_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/common/io/pci-ide
 
@@ -58,7 +58,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY) $(CONFMOD)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 #
@@ -85,12 +84,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/i86pc/pci/Makefile b/usr/src/uts/i86pc/pci/Makefile
index f2f9952670..96e9380af9 100644
--- a/usr/src/uts/i86pc/pci/Makefile
+++ b/usr/src/uts/i86pc/pci/Makefile
@@ -24,6 +24,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2016 Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 
 #
@@ -42,7 +43,6 @@ UTSBASE	= ../..
 #
 MODULE		= pci
 OBJECTS		= $(PCINEXUS_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(PCINEXUS_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 
 #
@@ -54,7 +54,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 #
@@ -67,16 +66,12 @@ LDFLAGS		+= -dy -Nmisc/pcihp
 # PCI/PCI-express nexi
 #
 CFLAGS		+= -D_MODULE_NAME="\"$(MODULE)\""
-LINTFLAGS	+= -D_MODULE_NAME="\"$(MODULE)\""
 
 #
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
+# For now, disable these checks; maintainers should endeavor
+# to investigate and remove these for maximum coverage.
 # Please do not carry these forward to new Makefiles.
 #
-LINTTAGS	+= -erroff=E_SUSPICIOUS_COMPARISON
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-uninitialized
 CERRWARN	+= -_gcc=-Wno-unused-function
@@ -94,12 +89,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/i86pc/pcie/Makefile b/usr/src/uts/i86pc/pcie/Makefile
index 2451a9d8f0..b72a3772dc 100644
--- a/usr/src/uts/i86pc/pcie/Makefile
+++ b/usr/src/uts/i86pc/pcie/Makefile
@@ -25,6 +25,7 @@
 # Use is subject to license terms.
 #
 # Copyright (c) 2018, Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 
 #
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
@@ -37,8 +38,6 @@ UTSBASE	= ../..
 MODULE		= pcie
 OBJECTS		= $(PCIE_MISC_OBJS:%=$(OBJS_DIR)/%) \
 		  $(PCI_STRING_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(PCIE_MISC_OBJS:%.o=$(LINTS_DIR)/%.ln) \
-		  $(PCI_STRING_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_MISC_DIR)/$(MODULE)
 
 #
@@ -55,7 +54,6 @@ LDFLAGS		+= -dy -Nmisc/acpica -Nmisc/busra
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 CERRWARN	+= -_gcc=-Wno-unused-value
@@ -80,12 +78,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/i86pc/pcplusmp/Makefile b/usr/src/uts/i86pc/pcplusmp/Makefile
index e3d3d1af15..931c618cb2 100644
--- a/usr/src/uts/i86pc/pcplusmp/Makefile
+++ b/usr/src/uts/i86pc/pcplusmp/Makefile
@@ -25,6 +25,7 @@
 # Use is subject to license terms.
 #
 # Copyright (c) 2019, Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 
 #
@@ -44,7 +45,6 @@ UTSBASE	= ../..
 #
 MODULE		= pcplusmp
 OBJECTS		= $(PCPLUSMP_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(PCPLUSMP_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_MACH_DIR)/$(MODULE)
 
 #
@@ -56,7 +56,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 DEBUG_FLGS      =
@@ -83,12 +82,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/i86pc/ppm/Makefile b/usr/src/uts/i86pc/ppm/Makefile
index b8ad45a623..59ce4a85ea 100644
--- a/usr/src/uts/i86pc/ppm/Makefile
+++ b/usr/src/uts/i86pc/ppm/Makefile
@@ -24,6 +24,8 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+#
 
 #
 #	This makefile drives the production of the generic power managment
@@ -42,7 +44,6 @@ UTSBASE	= ../..
 #
 MODULE		= ppm
 OBJECTS		= $(PPM_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(PPM_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/i86pc/io
 
@@ -55,12 +56,8 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
-#
-# lint pass one enforcement
-#
 CFLAGS += $(CCVERBOSE)
 
 CERRWARN += -_gcc=-Wno-parentheses
@@ -86,12 +83,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS) $(CONF_INSTALL_DEPS)
 
 #
diff --git a/usr/src/uts/i86pc/rootnex/Makefile b/usr/src/uts/i86pc/rootnex/Makefile
index 5f2410edef..d618a53590 100644
--- a/usr/src/uts/i86pc/rootnex/Makefile
+++ b/usr/src/uts/i86pc/rootnex/Makefile
@@ -25,6 +25,7 @@
 # Use is subject to license terms.
 #
 # Copyright (c) 2018, Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 
 #
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
@@ -36,7 +37,6 @@ UTSBASE	= ../..
 #
 MODULE		= rootnex
 OBJECTS		= $(ROOTNEX_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(ROOTNEX_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/i86pc/io
 
@@ -49,7 +49,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 #
@@ -58,14 +57,10 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 LDFLAGS		+= -dy -N misc/iommulib -N misc/acpica
 
 #
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
+# For now, disable these checks; maintainers should endeavor
+# to investigate and remove these for maximum coverage.
 # Please do not carry these forward to new Makefiles.
 #
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-LINTTAGS	+= -erroff=E_PTRDIFF_OVERFLOW
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-
 CERRWARN	+= -_gcc=-Wno-unused-label
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-unused-function
@@ -87,12 +82,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint: 	$(CLEAN_DEPS)
-
 install:	$(INSTALL_DEPS) $(CONF_INSTALL_DEPS)
 
 #
diff --git a/usr/src/uts/i86pc/tzmon/Makefile b/usr/src/uts/i86pc/tzmon/Makefile
index b8f15a547b..cbbef0eb0c 100644
--- a/usr/src/uts/i86pc/tzmon/Makefile
+++ b/usr/src/uts/i86pc/tzmon/Makefile
@@ -24,6 +24,7 @@
 # Use is subject to license terms.
 #
 # Copyright 2016 Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 
 #	This makefile drives the production of the tzmon
@@ -42,7 +43,6 @@ UTSBASE	= ../..
 #
 MODULE		= tzmon
 OBJECTS		= $(TZMON_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(TZMON_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/i86pc/io/tzmon
 
@@ -55,7 +55,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY) $(CONFMOD)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 DEBUG_FLGS      =
@@ -67,12 +66,10 @@ CERRWARN	+= -_gcc=-Wno-unused-function
 LDFLAGS		+= -dy -N misc/acpica
 
 #
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
+# For now, disable these checks; maintainers should endeavor
+# to investigate and remove these for maximum coverage.
 # Please do not carry these forward to new Makefiles.
 #
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-
 CERRWARN	+= -_gcc=-Wno-uninitialized
 
 #
@@ -88,12 +85,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/i86pc/unix/Makefile b/usr/src/uts/i86pc/unix/Makefile
index ad7f9b9fc9..709952df58 100644
--- a/usr/src/uts/i86pc/unix/Makefile
+++ b/usr/src/uts/i86pc/unix/Makefile
@@ -23,6 +23,7 @@
 # Copyright 2016 Joyent, Inc.
 #
 # Copyright (c) 2018, Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 
 #
 #	Path to the base of the uts directory tree (usually /usr/src/uts).
@@ -40,13 +41,6 @@ OBJECTS		= $(SPECIAL_OBJS:%=$(OBJS_DIR)/%) \
 		  $(KRTLD_OBJS:%=$(OBJS_DIR)/%) \
 		  $(MACH_NOT_YET_KMODS:%=$(OBJS_DIR)/%)
 
-LINTS		= $(SPECIAL_OBJS:%.o=$(LINTS_DIR)/%.ln) \
-		  $(CORE_OBJS:%.o=$(LINTS_DIR)/%.ln) \
-		  $(KRTLD_OBJS:%.o=$(LINTS_DIR)/%.ln) \
-		  $(MACH_NOT_YET_KMODS:%.o=$(LINTS_DIR)/%.ln) \
-		  $(LINTS_DIR)/vers.ln \
-		  $(LINTS_DIR)/modstubs.ln
-
 ROOTMODULE	= $(ROOT_PSM_KERN_DIR)/$(UNIX)
 
 UNIX_BIN	= $(OBJS_DIR)/$(UNIX)
@@ -67,9 +61,6 @@ DBOOT_OBJECTS	= $(DBOOT_OBJS:%=$(DBOOT_OBJS_DIR)/%)
 DBOOT_BIN	= $(DBOOT_OBJS_DIR)/$(DBOOT)
 DBOOT_O		= $(OBJS_DIR)/$(DBOOT).o
 DBOOT_S		= $(DBOOT_O:%.o=%.s)
-DBOOT_LINTS	= $(DBOOT_OBJS:%.o=$(DBOOT_OBJS_DIR)/%.ln)
-DBOOT_LINT	= $(i386_LINT)
-DBOOT_LINTTAGS	= -erroff=E_STATIC_UNUSED
 
 #
 #	Include common rules.
@@ -80,7 +71,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(UNIX_BIN)
-LINT_TARGET	= $(LINT_LIB) $(DBOOT_LINT_LIB)
 INSTALL_TARGET	= $(UNIX_BIN) $(ROOTMODULE)
 
 #
@@ -121,7 +111,6 @@ CLEANFILES	+= \
 	$(ZLIB_OBJS:%.o=$(OBJS_DIR)/%.ln)
 
 CLOBBERFILES	= $(CLEANFILES) $(UNIX_BIN)
-CLEANLINTFILES	+= $(LINT_LIB) $(DBOOT_LINT_LIB) $(DBOOT_LINTS)
 
 # instr_size needs a special header
 $(OBJS_DIR)/instr_size.o :=	EXTRA_OPTIONS	= -I$(SRC)/common/dis/i386
@@ -136,17 +125,10 @@ $(OBJS_DIR)/comm_page_ctf.o :=	CERRWARN += -_cc=-erroff=E_TKNS_IGNORED_AT_END_OF
 CFLAGS += -DDIS_MEM
 
 #
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
+# For now, disable these checks; maintainers should endeavor
+# to investigate and remove these for maximum coverage.
 # Please do not carry these forward to new Makefiles.
 #
-LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-LINTTAGS	+= -erroff=E_SUSPICIOUS_COMPARISON
-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-uninitialized
 CERRWARN	+= -_gcc=-Wno-char-subscripts
@@ -168,11 +150,6 @@ $(OBJS_DIR)/fmsmb.o := SMOFF += indenting
 $(OBJS_DIR)/zutil.o := SMOFF += indenting
 $(OBJS_DIR)/bootrd_cpio.o := SMOFF += allocating_enough_data
 
-# Ensure that lint sees 'struct cpu' containing a fully declared
-# embedded 'struct machcpu'
-#
-LINTFLAGS	+= -D_MACHDEP -I../../i86pc
-
 #
 #	Default build targets.
 #
@@ -186,10 +163,6 @@ clean: $(CLEAN_DEPS)
 
 clobber: $(CLOBBER_DEPS)
 
-lint: $(LINT_DEPS)
-
-clean.lint: $(CLEAN_LINT_DEPS)
-
 install: $(INSTALL_DEPS)
 
 MAPFILE_32 = $(MAPFILE)
@@ -237,30 +210,6 @@ $(DSF_DIR)/$(OBJS_DIR)/assym.h $(DSF_DIR)/$(OBJS_DIR)/kdi_assym.h:	FRC
 	@cd $(DSF_DIR); $(MAKE) all.targ
 
 #
-#	The global lint target builds the kernel lint library (llib-lunix.ln)
-#	which is equivalent to a lint of /unix.o. Then all kernel modules for
-#	this architecture are linted against the kernel lint library.
-#
-#	Note:	lint errors in the kernel lint library will be repeated for
-#		each module. It is important that the kernel lint library
-#		be clean to keep the textual output to a reasonable level.
-#
-
-$(LINT_LIB):	$(LINT_LIB_DIR) $(LINTS)
-	@pwd
-	@-$(ECHO) "\n$(UNIX): (library construction):"
-	@$(LINT) -o$(UNIX) $(LINTFLAGS) $(LINTS)
-	@$(MV) $(@F) $@
-
-$(DBOOT_LINT_LIB):	$(LINT_LIB_DIR) $(DBOOT_LINTS)
-	@pwd
-	@-$(ECHO) "\n$(DBOOT): (library construction):"
-	@$(LINT) -o$(DBOOT) $(DBOOT_LINTFLAGS) $(DBOOT_LINTS)
-	@$(MV) $(@F) $@
-
-lintlib:	$(LINT_DEPS)
-
-#
 #	Include common targets.
 #
 include $(UTSBASE)/i86pc/Makefile.targ
diff --git a/usr/src/uts/i86pc/uppc/Makefile b/usr/src/uts/i86pc/uppc/Makefile
index dbd949be09..22e33c6dd5 100644
--- a/usr/src/uts/i86pc/uppc/Makefile
+++ b/usr/src/uts/i86pc/uppc/Makefile
@@ -24,6 +24,7 @@
 # Use is subject to license terms.
 #
 # Copyright (c) 2018, Joyent, Inc.
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
 #
 #	This makefile drives the production of the uppc mach
 #	kernel module.
@@ -41,7 +42,6 @@ UTSBASE	= ../..
 #
 MODULE		= uppc
 OBJECTS		= $(UPPC_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(UPPC_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_MACH_DIR)/$(MODULE)
 
 #
@@ -53,7 +53,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 #
@@ -72,14 +71,6 @@ $(OBJS_DIR)/psm_common.o := SMOFF += deref_check
 LDFLAGS		+= -dy -N misc/acpica
 
 #
-# 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_BAD_PTR_CAST_ALIGN
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-
-#
 #	Default build targets.
 #
 .KEEP_STATE:
@@ -92,12 +83,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/i86pc/vm/Makefile b/usr/src/uts/i86pc/vm/Makefile
index 4f94ae3f11..034431994d 100644
--- a/usr/src/uts/i86pc/vm/Makefile
+++ b/usr/src/uts/i86pc/vm/Makefile
@@ -22,6 +22,8 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+#
 # uts/i86pc/vm/Makefile
 #
 UTSBASE = ../..
@@ -73,6 +75,4 @@ CLEANFILES=
 
 CLOBBERFILES=
 
-CLEANLINTFILES=
-
 include ../../Makefile.targ
diff --git a/usr/src/uts/i86pc/xsvc/Makefile b/usr/src/uts/i86pc/xsvc/Makefile
index cfa49328e6..be21b26687 100644
--- a/usr/src/uts/i86pc/xsvc/Makefile
+++ b/usr/src/uts/i86pc/xsvc/Makefile
@@ -24,6 +24,8 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+#
 
 #
 #	This makefile drives the production of the xsvc driver kernel
@@ -40,7 +42,6 @@ UTSBASE	= ../..
 #
 MODULE		= xsvc
 OBJECTS		= $(XSVC_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(XSVC_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
 CONF_SRCDIR	= $(UTSBASE)/i86pc/io/xsvc
 
@@ -53,7 +54,6 @@ include $(UTSBASE)/i86pc/Makefile.i86pc
 #	Define targets
 #
 ALL_TARGET	= $(BINARY) $(SRC_CONFILE)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 #
@@ -82,12 +82,6 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 #