10081 smatch indenting fixes for usr/src/uts

Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Robert Mustacchi <rm@joyent.com>

47 files changed, 314 insertions, 197 deletions

diff --git a/usr/src/uts/common/c2/audit_event.c b/usr/src/uts/common/c2/audit_event.c
index 5ccdba6965..cb75b17e3c 100644
--- a/usr/src/uts/common/c2/audit_event.c
+++ b/usr/src/uts/common/c2/audit_event.c
@@ -22,6 +22,7 @@
 /*
  * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2011 Bayard G. Bell. All rights reserved.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*
@@ -2340,9 +2341,9 @@ aus_ioctl(struct t_audit_data *tad)
 		au_uwrite(au_to_arg32(1, "fd", fd));
 		au_uwrite(au_to_arg32(2, "cmd", cmd));
 #ifndef _LP64
-			au_uwrite(au_to_arg32(3, "arg", (uint32_t)cmarg));
+		au_uwrite(au_to_arg32(3, "arg", (uint32_t)cmarg));
 #else
-			au_uwrite(au_to_arg64(3, "arg", (uint64_t)cmarg));
+		au_uwrite(au_to_arg64(3, "arg", (uint64_t)cmarg));
 #endif
 		return;
 	}
@@ -2363,9 +2364,9 @@ aus_ioctl(struct t_audit_data *tad)
 
 	au_uwrite(au_to_arg32(2, "cmd", cmd));
 #ifndef _LP64
-		au_uwrite(au_to_arg32(3, "arg", (uint32_t)cmarg));
+	au_uwrite(au_to_arg32(3, "arg", (uint32_t)cmarg));
 #else
-		au_uwrite(au_to_arg64(3, "arg", (uint64_t)cmarg));
+	au_uwrite(au_to_arg64(3, "arg", (uint64_t)cmarg));
 #endif
 }
 
diff --git a/usr/src/uts/common/fs/nfs/nfs_dlinet.c b/usr/src/uts/common/fs/nfs/nfs_dlinet.c
index 34658b161f..dfb7a15466 100644
--- a/usr/src/uts/common/fs/nfs/nfs_dlinet.c
+++ b/usr/src/uts/common/fs/nfs/nfs_dlinet.c
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -1143,7 +1147,7 @@ dhcpinit(void)
 						    "dhcp: couldn't add route "
 						    "to %s: %m.\n",
 						    inet_ntoa(defr));
-							continue;
+						continue;
 					}
 					if (dldebug) {
 						printf("dhcp: added route %s\n",
diff --git a/usr/src/uts/common/fs/portfs/port_fop.c b/usr/src/uts/common/fs/portfs/port_fop.c
index 045958059a..019de0540a 100644
--- a/usr/src/uts/common/fs/portfs/port_fop.c
+++ b/usr/src/uts/common/fs/portfs/port_fop.c
@@ -24,7 +24,7 @@
  */
 
 /*
- * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*
@@ -2029,7 +2029,7 @@ port_fop_unmount(fsemarg_t *vf, int flag, cred_t *cr)
 	 * the hash list.
 	 */
 	for (pvfsp = *ppvfsp; pvfsp->pvfs != vfsp; pvfsp = pvfsp->pvfs_next)
-	;
+		;
 
 	/*
 	 * For some of the filesystems, allow unmounts to proceed only if
@@ -2079,7 +2079,7 @@ port_fop_unmount(fsemarg_t *vf, int flag, cred_t *cr)
 	mutex_enter(mtx);
 	for (; *ppvfsp && (*ppvfsp)->pvfs != vfsp;
 	    ppvfsp = &(*ppvfsp)->pvfs_next)
-	;
+		;
 
 	/*
 	 * remove and free it.
diff --git a/usr/src/uts/common/inet/ip/ip_mroute.c b/usr/src/uts/common/inet/ip/ip_mroute.c
index dfac414613..087d0b72e5 100644
--- a/usr/src/uts/common/inet/ip/ip_mroute.c
+++ b/usr/src/uts/common/inet/ip/ip_mroute.c
@@ -24,6 +24,10 @@
 /* Copyright (c) 1990 Mentat Inc. */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Procedures for the kernel part of DVMRP,
  * a Distance-Vector Multicast Routing Protocol.
  * (See RFC-1075)
@@ -720,7 +724,7 @@ ip_mrouter_done(ip_stack_t *ipst)
 					mutex_exit(&mfc_rt->mfc_mutex);
 					(void) untimeout(
 					    mfc_rt->mfc_timeout_id);
-						mfc_rt->mfc_timeout_id = 0;
+					mfc_rt->mfc_timeout_id = 0;
 					mutex_enter(&mfc_rt->mfc_mutex);
 
 					/*
diff --git a/usr/src/uts/common/inet/ip/ip_ndp.c b/usr/src/uts/common/inet/ip/ip_ndp.c
index eabe8949ae..211e56633f 100644
--- a/usr/src/uts/common/inet/ip/ip_ndp.c
+++ b/usr/src/uts/common/inet/ip/ip_ndp.c
@@ -22,6 +22,10 @@
  * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/stream.h>
 #include <sys/stropts.h>
@@ -4955,7 +4959,7 @@ nce_fuzz_interval(clock_t intv, boolean_t initial_time)
 			frac = 2;
 		/* Set intv randomly in the range [intv-frac .. intv+frac] */
 		if ((intv = intv - frac + rnd % (2 * frac + 1)) <= 0)
-		intv = 1;
+			intv = 1;
 	}
 	return (intv);
 }
diff --git a/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_chan.c b/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_chan.c
index 7301983986..e2a85f6c3a 100644
--- a/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_chan.c
+++ b/usr/src/uts/common/io/1394/targets/av1394/av1394_isoch_chan.c
@@ -24,6 +24,10 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * routines common to isoch receive and isoch transmit
  */
 #include <sys/stat.h>
@@ -614,10 +618,11 @@ av1394_ic_dma_sync_frames(av1394_ic_t *icp, int idx, int cnt,
 
 	nsegs = (cnt / fps) + 1;
 
-		seg = idx / fps;
-		for (;;) {
-			(void) ddi_dma_sync(pool->ip_seg[seg].is_dma_hdl, 0,
-			    icp->ic_framesz, type);
+	seg = idx / fps;
+
+	for (;;) {
+		(void) ddi_dma_sync(pool->ip_seg[seg].is_dma_hdl, 0,
+		    icp->ic_framesz, type);
 
 		--nsegs;
 		if (nsegs == 0)
diff --git a/usr/src/uts/common/io/1394/targets/dcam1394/dcam.c b/usr/src/uts/common/io/1394/targets/dcam1394/dcam.c
index e1acea0878..c300e987d8 100644
--- a/usr/src/uts/common/io/1394/targets/dcam1394/dcam.c
+++ b/usr/src/uts/common/io/1394/targets/dcam1394/dcam.c
@@ -21,7 +21,7 @@
 /*
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- * Copyright 2017 Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 
@@ -193,7 +193,7 @@ _fini(void)
 	}
 
 #ifndef NPROBE
-		(void) tnf_mod_unload(&modlinkage);
+	(void) tnf_mod_unload(&modlinkage);
 #endif /* ! NPROBE */
 
 	ddi_soft_state_fini(&dcam_state_p);
diff --git a/usr/src/uts/common/io/aac/aac.c b/usr/src/uts/common/io/aac/aac.c
index c0d3f5c89d..fd302ad599 100644
--- a/usr/src/uts/common/io/aac/aac.c
+++ b/usr/src/uts/common/io/aac/aac.c
@@ -3,6 +3,7 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
  * Copyright 2005-08 Adaptec, Inc.
  * Copyright (c) 2005-08 Adaptec Inc., Achim Leubner
  * Copyright (c) 2000 Michael Smith
@@ -7312,7 +7313,7 @@ aac_config_tgt(struct aac_softstate *softs, int tgt)
 		if (bp == NULL) {
 			if ((bp = scsi_alloc_consistent_buf(&ap, NULL,
 			    buf_len, B_READ, NULL_FUNC, NULL)) == NULL)
-			return (AACERR);
+				return (AACERR);
 		}
 		if ((pkt = scsi_init_pkt(&ap, NULL, bp, CDB_GROUP5,
 		    sizeof (struct scsi_arq_status), 0, PKT_CONSISTENT,
diff --git a/usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/clc.h b/usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/clc.h
index 47d383a64c..d4faa2dca1 100644
--- a/usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/clc.h
+++ b/usr/src/uts/common/io/bnxe/577xx/hsi/hw/include/clc.h
@@ -82,10 +82,6 @@ extern void elink_cb_notify_link_changed(struct elink_dev *cb);
 #define ELINK_EVENT_ID_SFP_UNQUALIFIED_MODULE 	1
 #define ELINK_EVENT_ID_SFP_POWER_FAULT 		2
 
-#ifdef ELINK_AUX_POWER
-#define elink_cb_event_log(cb, level, ...)
-#define elink_cb_get_friendly_name(cb) ''
-#endif /*ELINK_AUX_POWER */
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 #endif
diff --git a/usr/src/uts/common/io/cryptmod.c b/usr/src/uts/common/io/cryptmod.c
index 7d7626e2ef..e2315e8e9e 100644
--- a/usr/src/uts/common/io/cryptmod.c
+++ b/usr/src/uts/common/io/cryptmod.c
@@ -2,6 +2,8 @@
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
+ * Copyright (c) 2018, Joyent, Inc.
+ *
  * STREAMS Crypto Module
  *
  * This module is used to facilitate Kerberos encryption
@@ -3003,7 +3005,7 @@ encrypt_block(queue_t *q, struct tmodinfo *tmi, mblk_t *mp, size_t plainlen)
 		if (cbp == NULL) {
 			cmn_err(CE_WARN,
 				"allocb (%d bytes) failed", sz);
-				return (NULL);
+			return (NULL);
 		}
 
 		cbp->b_cont = mp->b_cont;
diff --git a/usr/src/uts/common/io/dld/dld_proto.c b/usr/src/uts/common/io/dld/dld_proto.c
index 0d7b774fa1..05989dccb2 100644
--- a/usr/src/uts/common/io/dld/dld_proto.c
+++ b/usr/src/uts/common/io/dld/dld_proto.c
@@ -21,7 +21,7 @@
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2012, Nexenta Systems, Inc. All rights reserved.
- * Copyright 2017 Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*
@@ -817,7 +817,7 @@ proto_disabmulti_req(dld_str_t *dsp, mblk_t *mp)
 	mac_perim_exit(mph);
 
 	if (err != 0) {
-	switch (err) {
+		switch (err) {
 		case EINVAL:
 			dl_err = DL_BADADDR;
 			err = 0;
diff --git a/usr/src/uts/common/io/fd.c b/usr/src/uts/common/io/fd.c
index fadd776414..d591e04331 100644
--- a/usr/src/uts/common/io/fd.c
+++ b/usr/src/uts/common/io/fd.c
@@ -23,6 +23,9 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
 
 /*
  * Floppy Disk driver
@@ -1769,7 +1772,7 @@ get_geom:
 		if (rval != 0)
 			break;
 
-	if (fc.fdc_cmd == FDCMD_READ || fc.fdc_cmd == FDCMD_WRITE) {
+		if (fc.fdc_cmd == FDCMD_READ || fc.fdc_cmd == FDCMD_WRITE) {
 			auto struct iovec aiov;
 			auto struct uio auio;
 			struct uio *uio = &auio;
diff --git a/usr/src/uts/common/io/fibre-channel/fca/oce/oce_gld.c b/usr/src/uts/common/io/fibre-channel/fca/oce/oce_gld.c
index 19d210d4d1..846f8896d9 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/oce/oce_gld.c
+++ b/usr/src/uts/common/io/fibre-channel/fca/oce/oce_gld.c
@@ -22,6 +22,10 @@
 /* Copyright © 2003-2011 Emulex. All rights reserved.  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Source file containing the implementation of the driver entry points
  * and related helper functions
  */
@@ -210,7 +214,7 @@ oce_m_multicast(void *arg, boolean_t add, const uint8_t *mca)
 		ret = oce_set_multicast_table(dev, dev->if_id,
 		    &mca_hw_list[0], new_mcnt, B_FALSE);
 	}
-		if (ret != 0) {
+	if (ret != 0) {
 		oce_log(dev, CE_WARN, MOD_CONFIG,
 		    "mcast %s fails", add ? "ADD" : "DEL");
 		DEV_UNLOCK(dev);
diff --git a/usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c b/usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c
index 96f7b19e02..3de0aa1116 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c
+++ b/usr/src/uts/common/io/fibre-channel/fca/oce/oce_mbx.c
@@ -21,6 +21,9 @@
 
 /* Copyright © 2003-2011 Emulex. All rights reserved.  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
 
 /*
  * Source file containing the implementation of MBOX
@@ -156,7 +159,7 @@ oce_mbox_wait(struct oce_dev *dev, uint32_t tmo_sec)
 		if (mbox_db.bits.ready) {
 			return (0);
 		}
-			drv_usecwait(5);
+		drv_usecwait(5);
 	}
 
 	return (ETIMEDOUT);
diff --git a/usr/src/uts/common/io/fibre-channel/fca/qlge/qlge.c b/usr/src/uts/common/io/fibre-channel/fca/qlge/qlge.c
index e624ea7cf1..213dbc51b0 100644
--- a/usr/src/uts/common/io/fibre-channel/fca/qlge/qlge.c
+++ b/usr/src/uts/common/io/fibre-channel/fca/qlge/qlge.c
@@ -23,6 +23,10 @@
  * Copyright 2010 QLogic Corporation. All rights reserved.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <qlge.h>
 #include <sys/atomic.h>
 #include <sys/strsubr.h>
@@ -2400,7 +2404,7 @@ ql_set_rx_cksum(mblk_t *mp, struct ib_mac_iocb_rsp *net_rsp)
 	/* Not TCP or UDP packet? nothing more to do */
 	if (((net_rsp->flags2 & IB_MAC_IOCB_RSP_T) == 0) &&
 	    ((net_rsp->flags2 & IB_MAC_IOCB_RSP_U) == 0))
-	return;
+		return;
 
 	/* No CKO support for IPv6 */
 	if ((net_rsp->flags3 & IB_MAC_IOCB_RSP_V6) != 0)
diff --git a/usr/src/uts/common/io/ib/clients/rds/rdsddi.c b/usr/src/uts/common/io/ib/clients/rds/rdsddi.c
index 8a78af2b51..35e7a55154 100644
--- a/usr/src/uts/common/io/ib/clients/rds/rdsddi.c
+++ b/usr/src/uts/common/io/ib/clients/rds/rdsddi.c
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/modctl.h>
@@ -839,7 +843,7 @@ rds_wrw(queue_t *q, struiod_t *dp)
 			/* Detect valid T_UNITDATA_REQ here */
 			if (((union T_primitives *)(uintptr_t)rptr)->type
 			    == T_UNITDATA_REQ)
-			break;
+				break;
 		}
 		/* FALLTHRU */
 	default:
diff --git a/usr/src/uts/common/io/ib/ibnex/ibnex.c b/usr/src/uts/common/io/ib/ibnex/ibnex.c
index 46defb6cbc..d25c6ddf05 100644
--- a/usr/src/uts/common/io/ib/ibnex/ibnex.c
+++ b/usr/src/uts/common/io/ib/ibnex/ibnex.c
@@ -23,6 +23,10 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * The InfiniBand  Nexus driver (IB nexus) is a bus nexus driver for IB bus.
  * It supports  Port nodes, Virtual Physical Point of Attachment nodes (VPPA)
  * for  HCAs registered with IBTL and IOC nodes for all the IOCs present in
@@ -2863,7 +2867,7 @@ ibnex_comm_svc_init(char *property, ibnex_node_type_t type)
 				IBTF_DPRINTF_L2("ibnex", "\tcomm_svc_init : "
 				    "Service name %s invalid : Not unique",
 				    servicep[count]);
-					continue;
+				continue;
 			}
 
 		valid[count] = 1;
diff --git a/usr/src/uts/common/io/iwp/iwp.c b/usr/src/uts/common/io/iwp/iwp.c
index eec2b84664..69e2c928df 100644
--- a/usr/src/uts/common/io/iwp/iwp.c
+++ b/usr/src/uts/common/io/iwp/iwp.c
@@ -1,4 +1,8 @@
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -3832,21 +3836,21 @@ iwp_hw_set_before_auth(iwp_sc_t *sc)
 	IEEE80211_ADDR_COPY(sc->sc_config.bssid, in->in_bssid);
 	sc->sc_config.chan = LE_16(ieee80211_chan2ieee(ic, in->in_chan));
 
-		sc->sc_config.ofdm_ht_triple_stream_basic_rates = 0;
-		sc->sc_config.ofdm_ht_dual_stream_basic_rates = 0;
-		sc->sc_config.ofdm_ht_single_stream_basic_rates = 0;
-
-		if (IEEE80211_MODE_11B == ic->ic_curmode) {
-			sc->sc_config.cck_basic_rates  = 0x03;
-			sc->sc_config.ofdm_basic_rates = 0;
-		} else if ((in->in_chan != IEEE80211_CHAN_ANYC) &&
-		    (IEEE80211_IS_CHAN_5GHZ(in->in_chan))) {
-			sc->sc_config.cck_basic_rates  = 0;
-			sc->sc_config.ofdm_basic_rates = 0x15;
-		} else { /* assume 802.11b/g */
-			sc->sc_config.cck_basic_rates  = 0x0f;
-			sc->sc_config.ofdm_basic_rates = 0xff;
-		}
+	sc->sc_config.ofdm_ht_triple_stream_basic_rates = 0;
+	sc->sc_config.ofdm_ht_dual_stream_basic_rates = 0;
+	sc->sc_config.ofdm_ht_single_stream_basic_rates = 0;
+
+	if (IEEE80211_MODE_11B == ic->ic_curmode) {
+		sc->sc_config.cck_basic_rates  = 0x03;
+		sc->sc_config.ofdm_basic_rates = 0;
+	} else if ((in->in_chan != IEEE80211_CHAN_ANYC) &&
+	    (IEEE80211_IS_CHAN_5GHZ(in->in_chan))) {
+		sc->sc_config.cck_basic_rates  = 0;
+		sc->sc_config.ofdm_basic_rates = 0x15;
+	} else { /* assume 802.11b/g */
+		sc->sc_config.cck_basic_rates  = 0x0f;
+		sc->sc_config.ofdm_basic_rates = 0xff;
+	}
 
 	sc->sc_config.flags &= ~LE_32(RXON_FLG_SHORT_PREAMBLE_MSK |
 	    RXON_FLG_SHORT_SLOT_MSK);
diff --git a/usr/src/uts/common/io/nge/nge_chip.c b/usr/src/uts/common/io/nge/nge_chip.c
index 04a5858840..0bef9ff505 100644
--- a/usr/src/uts/common/io/nge/nge_chip.c
+++ b/usr/src/uts/common/io/nge/nge_chip.c
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include "nge.h"
 static uint32_t	nge_watchdog_count	= 1 << 5;
 static uint32_t	nge_watchdog_check	= 1 << 3;
@@ -1010,25 +1014,25 @@ nge_chip_reset(nge_t *ngep)
 		mac = uaddr1.addr_bits.addr;
 		mac <<= 32;
 		mac |= nge_reg_get32(ngep, NGE_UNI_ADDR0);
-			ngep->chipinfo.hw_mac_addr = mac;
-			if (ngep->dev_spec_param.mac_addr_order) {
-				for (i = 0; i < ETHERADDRL; i++) {
-					ngep->chipinfo.vendor_addr.addr[i] =
-					    (uchar_t)mac;
-					ngep->cur_uni_addr.addr[i] =
-					    (uchar_t)mac;
-					mac >>= 8;
-				}
-			} else {
-				for (i = ETHERADDRL; i-- != 0; ) {
-					ngep->chipinfo.vendor_addr.addr[i] =
-					    (uchar_t)mac;
-					ngep->cur_uni_addr.addr[i] =
-					    (uchar_t)mac;
-					mac >>= 8;
-				}
+		ngep->chipinfo.hw_mac_addr = mac;
+		if (ngep->dev_spec_param.mac_addr_order) {
+			for (i = 0; i < ETHERADDRL; i++) {
+				ngep->chipinfo.vendor_addr.addr[i] =
+				    (uchar_t)mac;
+				ngep->cur_uni_addr.addr[i] =
+				    (uchar_t)mac;
+				mac >>= 8;
+			}
+		} else {
+			for (i = ETHERADDRL; i-- != 0; ) {
+				ngep->chipinfo.vendor_addr.addr[i] =
+				    (uchar_t)mac;
+				ngep->cur_uni_addr.addr[i] =
+				    (uchar_t)mac;
+				mac >>= 8;
 			}
-			ngep->chipinfo.vendor_addr.set = 1;
+		}
+		ngep->chipinfo.vendor_addr.set = 1;
 	}
 	pci_config_put8(ngep->cfg_handle, PCI_CONF_CACHE_LINESZ,
 	    ngep->chipinfo.clsize);
diff --git a/usr/src/uts/common/io/ntxn/unm_gem.c b/usr/src/uts/common/io/ntxn/unm_gem.c
index c08f99d5ab..832a87450b 100644
--- a/usr/src/uts/common/io/ntxn/unm_gem.c
+++ b/usr/src/uts/common/io/ntxn/unm_gem.c
@@ -26,6 +26,11 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/debug.h>
@@ -1355,7 +1360,7 @@ unmdetach(dev_info_t *dip, ddi_detach_cmd_t cmd)
 	unm_adapter  *adapter = (unm_adapter *)ddi_get_driver_private(dip);
 
 	if (adapter == NULL)
-	return (DDI_FAILURE);
+		return (DDI_FAILURE);
 
 	switch (cmd) {
 	case DDI_DETACH:
diff --git a/usr/src/uts/common/io/ntxn/unm_nic_hw.c b/usr/src/uts/common/io/ntxn/unm_nic_hw.c
index 7a78099ecc..c3f46d0e19 100644
--- a/usr/src/uts/common/io/ntxn/unm_nic_hw.c
+++ b/usr/src/uts/common/io/ntxn/unm_nic_hw.c
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/debug.h>
@@ -1859,10 +1863,10 @@ unm_nic_set_promisc_mode(struct unm_adapter_s *adapter)
 			break;
 	}
 
-if (!ret)
-	adapter->promisc = 1;
+	if (!ret)
+		adapter->promisc = 1;
 
-		return (ret);
+	return (ret);
 }
 
 int
diff --git a/usr/src/uts/common/io/ntxn/unm_nic_init.c b/usr/src/uts/common/io/ntxn/unm_nic_init.c
index ba05e099c8..0ca6b12ff4 100644
--- a/usr/src/uts/common/io/ntxn/unm_nic_init.c
+++ b/usr/src/uts/common/io/ntxn/unm_nic_init.c
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/debug.h>
@@ -67,56 +71,56 @@ static unsigned int crb_addr_xform[MAX_CRB_XFORM];
 static void
 crb_addr_transform_setup(void)
 {
-		crb_addr_transform(XDMA);
-		crb_addr_transform(TIMR);
-		crb_addr_transform(SRE);
-		crb_addr_transform(SQN3);
-		crb_addr_transform(SQN2);
-		crb_addr_transform(SQN1);
-		crb_addr_transform(SQN0);
-		crb_addr_transform(SQS3);
-		crb_addr_transform(SQS2);
-		crb_addr_transform(SQS1);
-		crb_addr_transform(SQS0);
-		crb_addr_transform(RPMX7);
-		crb_addr_transform(RPMX6);
-		crb_addr_transform(RPMX5);
-		crb_addr_transform(RPMX4);
-		crb_addr_transform(RPMX3);
-		crb_addr_transform(RPMX2);
-		crb_addr_transform(RPMX1);
-		crb_addr_transform(RPMX0);
-		crb_addr_transform(ROMUSB);
-		crb_addr_transform(SN);
-		crb_addr_transform(QMN);
-		crb_addr_transform(QMS);
-		crb_addr_transform(PGNI);
-		crb_addr_transform(PGND);
-		crb_addr_transform(PGN3);
-		crb_addr_transform(PGN2);
-		crb_addr_transform(PGN1);
-		crb_addr_transform(PGN0);
-		crb_addr_transform(PGSI);
-		crb_addr_transform(PGSD);
-		crb_addr_transform(PGS3);
-		crb_addr_transform(PGS2);
-		crb_addr_transform(PGS1);
-		crb_addr_transform(PGS0);
-		crb_addr_transform(PS);
-		crb_addr_transform(PH);
-		crb_addr_transform(NIU);
-		crb_addr_transform(I2Q);
-		crb_addr_transform(EG);
-		crb_addr_transform(MN);
-		crb_addr_transform(MS);
-		crb_addr_transform(CAS2);
-		crb_addr_transform(CAS1);
-		crb_addr_transform(CAS0);
-		crb_addr_transform(CAM);
-		crb_addr_transform(C2C1);
-		crb_addr_transform(C2C0);
-		crb_addr_transform(SMB);
-		crb_addr_transform(OCM0);
+	crb_addr_transform(XDMA);
+	crb_addr_transform(TIMR);
+	crb_addr_transform(SRE);
+	crb_addr_transform(SQN3);
+	crb_addr_transform(SQN2);
+	crb_addr_transform(SQN1);
+	crb_addr_transform(SQN0);
+	crb_addr_transform(SQS3);
+	crb_addr_transform(SQS2);
+	crb_addr_transform(SQS1);
+	crb_addr_transform(SQS0);
+	crb_addr_transform(RPMX7);
+	crb_addr_transform(RPMX6);
+	crb_addr_transform(RPMX5);
+	crb_addr_transform(RPMX4);
+	crb_addr_transform(RPMX3);
+	crb_addr_transform(RPMX2);
+	crb_addr_transform(RPMX1);
+	crb_addr_transform(RPMX0);
+	crb_addr_transform(ROMUSB);
+	crb_addr_transform(SN);
+	crb_addr_transform(QMN);
+	crb_addr_transform(QMS);
+	crb_addr_transform(PGNI);
+	crb_addr_transform(PGND);
+	crb_addr_transform(PGN3);
+	crb_addr_transform(PGN2);
+	crb_addr_transform(PGN1);
+	crb_addr_transform(PGN0);
+	crb_addr_transform(PGSI);
+	crb_addr_transform(PGSD);
+	crb_addr_transform(PGS3);
+	crb_addr_transform(PGS2);
+	crb_addr_transform(PGS1);
+	crb_addr_transform(PGS0);
+	crb_addr_transform(PS);
+	crb_addr_transform(PH);
+	crb_addr_transform(NIU);
+	crb_addr_transform(I2Q);
+	crb_addr_transform(EG);
+	crb_addr_transform(MN);
+	crb_addr_transform(MS);
+	crb_addr_transform(CAS2);
+	crb_addr_transform(CAS1);
+	crb_addr_transform(CAS0);
+	crb_addr_transform(CAM);
+	crb_addr_transform(C2C1);
+	crb_addr_transform(C2C0);
+	crb_addr_transform(SMB);
+	crb_addr_transform(OCM0);
 
 	/*
 	 * Used only in P3 just define it for P2 also.
diff --git a/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c b/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c
index b49db2f526..25c91f3560 100644
--- a/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c
+++ b/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2016 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2017, Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  * Copyright 2014 OmniTI Computer Consulting, Inc. All rights reserved.
  * Copyright (c) 2014, Tegile Systems Inc. All rights reserved.
  */
@@ -11958,7 +11958,7 @@ mptsas_diag_register(mptsas_t *mpt, mptsas_fw_diag_register_t *diag_register,
 		mptsas_log(mpt, CE_WARN, "Check of DMA handle failed in "
 		    "mptsas_diag_register.");
 		ddi_fm_service_impact(mpt->m_dip, DDI_SERVICE_UNAFFECTED);
-			status = DDI_FAILURE;
+		status = DDI_FAILURE;
 	}
 
 	/*
diff --git a/usr/src/uts/common/io/skd/skd.c b/usr/src/uts/common/io/skd/skd.c
index e7759e74d7..78753ba00f 100644
--- a/usr/src/uts/common/io/skd/skd.c
+++ b/usr/src/uts/common/io/skd/skd.c
@@ -23,6 +23,7 @@
 /*
  * Copyright 2013 STEC, Inc.  All rights reserved.
  * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 #include	<sys/types.h>
@@ -4775,8 +4776,8 @@ skd_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
 	}
 	progress |= SKD_REGS_MAPPED;
 
-		skdev->iomap_iobase = skdev->iobase;
-		skdev->iomap_handle = skdev->iobase_handle;
+	skdev->iomap_iobase = skdev->iobase;
+	skdev->iomap_handle = skdev->iobase_handle;
 
 	Dcmn_err(CE_NOTE, "%s: PCI iobase=%ph, iomap=%ph, regnum=%d, "
 	    "regsize=%ld", skdev->name, (void *)skdev->iobase,
diff --git a/usr/src/uts/common/io/tl.c b/usr/src/uts/common/io/tl.c
index 1bdddf2ecf..3e2acab1ec 100644
--- a/usr/src/uts/common/io/tl.c
+++ b/usr/src/uts/common/io/tl.c
@@ -25,7 +25,7 @@
 /*
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
- * Copyright 2015 Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*
@@ -2978,7 +2978,7 @@ tl_conn_req(queue_t *wq, mblk_t *mp)
 		 */
 		(void) (STRLOG(TL_ID, tep->te_minor, 2, SL_TRACE,
 		    "tl_conn_req: qlen overflow connection refused"));
-			err = ECONNREFUSED;
+		err = ECONNREFUSED;
 	}
 
 	/*
diff --git a/usr/src/uts/common/io/urtw/urtw.c b/usr/src/uts/common/io/urtw/urtw.c
index b649ca609d..9f03555479 100644
--- a/usr/src/uts/common/io/urtw/urtw.c
+++ b/usr/src/uts/common/io/urtw/urtw.c
@@ -1,4 +1,8 @@
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -190,7 +194,7 @@ usb_match_device(struct urtw_type *tbl, uint32_t nentries,
 		uint16_t tproduct = tbl[nentries].dev.p;
 		if (tbl[nentries].dev.v == vendor &&
 		    (tproduct == product || tproduct == USB_PRODUCT_ANY))
-		return (&tbl[nentries]);
+			return (&tbl[nentries]);
 	}
 	return (NULL);
 }
diff --git a/usr/src/uts/common/io/usb/clients/hidparser/hidparser.c b/usr/src/uts/common/io/usb/clients/hidparser/hidparser.c
index 3fb1e4ee87..a830ff1c65 100644
--- a/usr/src/uts/common/io/usb/clients/hidparser/hidparser.c
+++ b/usr/src/uts/common/io/usb/clients/hidparser/hidparser.c
@@ -23,6 +23,9 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
 
 #include <sys/usb/usba/usbai_version.h>
 #include <sys/usb/usba.h>
@@ -1642,11 +1645,11 @@ hidparser_ItemList(entity_item_t ** item_ptr, hidparser_tok_t *scan_ifp)
 			curr_ei->prev_coll = cache_ei;
 			cache_ei = curr_ei;
 
-				USB_DPRINTF_L3(PRINT_MASK_ALL,
-				    hparser_log_handle,
-				    "Start Collection:cache_ei = 0x%p,"
-				    " curr_ei = 0x%p",
-				    (void *)cache_ei, (void *)curr_ei);
+			USB_DPRINTF_L3(PRINT_MASK_ALL,
+			    hparser_log_handle,
+			    "Start Collection:cache_ei = 0x%p,"
+			    " curr_ei = 0x%p",
+			    (void *)cache_ei, (void *)curr_ei);
 
 			if (prev_ei == NULL) {
 				prev_ei = curr_ei;
diff --git a/usr/src/uts/common/io/usb/clients/usbinput/usbwcm/usbwcm.c b/usr/src/uts/common/io/usb/clients/usbinput/usbwcm/usbwcm.c
index 253e4862b7..39f2bf252c 100644
--- a/usr/src/uts/common/io/usb/clients/usbinput/usbwcm/usbwcm.c
+++ b/usr/src/uts/common/io/usb/clients/usbinput/usbwcm/usbwcm.c
@@ -1,4 +1,8 @@
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -510,7 +514,7 @@ usbwcm_input_intuos(usbwcm_state_t *usbwcmp, mblk_t *mp)
 		case 0x1:
 		/* Outbound tracking is unreliable on the Cintiq */
 			if (sc->sc_type->protocol == CINTIQ)
-			break;
+				break;
 
 		/* Tool motion */
 		/*FALLTHRU*/
diff --git a/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c b/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c
index c2bae40ba4..6257ec100e 100644
--- a/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c
+++ b/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c
@@ -22,6 +22,9 @@
  * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
 
 /*
  * USB video class driver (usbvc(7D))
@@ -1337,8 +1340,8 @@ usbvc_pwrlvl0(usbvc_state_t *usbvcp)
 	case USB_DEV_ONLINE:
 		/* Deny the powerdown request if the device is busy */
 		if (usbvcp->usbvc_pm->usbvc_pm_busy != 0) {
-		USB_DPRINTF_L2(PRINT_MASK_PM, usbvcp->usbvc_log_handle,
-		    "usbvc_pwrlvl0: usbvc_pm_busy");
+			USB_DPRINTF_L2(PRINT_MASK_PM, usbvcp->usbvc_log_handle,
+			    "usbvc_pwrlvl0: usbvc_pm_busy");
 
 			return (USB_FAILURE);
 		}
diff --git a/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c b/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c
index 7e0e658601..badf500638 100644
--- a/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c
+++ b/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c
@@ -450,7 +450,7 @@ ehci_allocate_pools(ehci_state_t	*ehcip)
 			USB_DPRINTF_L2(PRINT_MASK_ATTA, ehcip->ehci_log_hdl,
 			    "ehci_allocate_pools: More than 1 cookie");
 
-		goto failure;
+			goto failure;
 		}
 	} else {
 		USB_DPRINTF_L4(PRINT_MASK_ATTA, ehcip->ehci_log_hdl,
diff --git a/usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c b/usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c
index 5737b9c3e1..717c9f96b1 100644
--- a/usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c
+++ b/usr/src/uts/common/io/usb/hcd/openhci/ohci_polled.c
@@ -22,6 +22,7 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  * Copyright (c) 2016 by Delphix. All rights reserved.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*
@@ -1351,7 +1352,8 @@ ohci_polled_restore_state(ohci_polled_t	*ohci_polledp)
 
 		while (td) {
 
-		next_td = ohci_td_iommu_to_cpu(ohcip, Get_TD(td->hctd_next_td));
+			next_td = ohci_td_iommu_to_cpu(ohcip,
+			    Get_TD(td->hctd_next_td));
 
 			/*
 			 * Insert valid interrupt TD back into ED's
diff --git a/usr/src/uts/common/io/usb/usba/hubdi.c b/usr/src/uts/common/io/usb/usba/hubdi.c
index 1cee13edd1..e3f3722de8 100644
--- a/usr/src/uts/common/io/usb/usba/hubdi.c
+++ b/usr/src/uts/common/io/usb/usba/hubdi.c
@@ -22,7 +22,7 @@
  * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
  * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
- * Copyright 2016 Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*
@@ -6799,7 +6799,7 @@ hubd_delete_child(hubd_t *hubd, usb_port_t port, uint_t flag, boolean_t retry)
 			if (hubd->h_children_dips[port] == child_dip) {
 				usba_device_t *ud =
 				    hubd->h_usba_devices[port];
-					hubd->h_children_dips[port] = NULL;
+				hubd->h_children_dips[port] = NULL;
 				if (ud) {
 					mutex_exit(HUBD_MUTEX(hubd));
 
diff --git a/usr/src/uts/common/io/vr/vr.c b/usr/src/uts/common/io/vr/vr.c
index 4447b85622..0ba847bc53 100644
--- a/usr/src/uts/common/io/vr/vr.c
+++ b/usr/src/uts/common/io/vr/vr.c
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/stream.h>
 #include <sys/strsun.h>
@@ -1700,7 +1704,7 @@ vr_periodic(void *p)
 					vrp->reset = 1;
 					vr_log(vrp, CE_WARN,
 					    "TX stalled, resetting MAC");
-				vrp->stats.txstalls++;
+					vrp->stats.txstalls++;
 				} else {
 					/*
 					 * Increase until we find that we've
@@ -3390,9 +3394,9 @@ vr_mac_propinfo(void *arg, const char *pr_name, mac_prop_id_t pr_num,
 
 		default:
 			return;
-		}
+	}
 
-		mac_prop_info_set_default_uint8(prh, val);
+	mac_prop_info_set_default_uint8(prh, val);
 }
 
 /*
diff --git a/usr/src/uts/common/krtld/kobj.c b/usr/src/uts/common/krtld/kobj.c
index b98f5c188a..32c61e5c64 100644
--- a/usr/src/uts/common/krtld/kobj.c
+++ b/usr/src/uts/common/krtld/kobj.c
@@ -25,6 +25,7 @@
 /*
  * Copyright 2011 Bayard G. Bell <buffer.g.overflow@gmail.com>.
  * All rights reserved. Use is subject to license terms.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*
@@ -3372,26 +3373,26 @@ sym_insert(struct module *mp, char *name, symid_t index)
 	symid_t *ip;
 
 #ifdef KOBJ_DEBUG
-		if (kobj_debug & D_SYMBOLS) {
-			static struct module *lastmp = NULL;
-			Sym *sp;
-			if (lastmp != mp) {
-				_kobj_printf(ops,
-				    "krtld: symbol entry: file=%s\n",
-				    mp->filename);
-				_kobj_printf(ops,
-				    "krtld:\tsymndx\tvalue\t\t"
-				    "symbol name\n");
-				lastmp = mp;
-			}
-			sp = (Sym *)(mp->symtbl +
-			    index * mp->symhdr->sh_entsize);
-			_kobj_printf(ops, "krtld:\t[%3d]", index);
-			_kobj_printf(ops, "\t0x%lx", sp->st_value);
-			_kobj_printf(ops, "\t%s\n", name);
+	if (kobj_debug & D_SYMBOLS) {
+		static struct module *lastmp = NULL;
+		Sym *sp;
+		if (lastmp != mp) {
+			_kobj_printf(ops,
+			    "krtld: symbol entry: file=%s\n",
+			    mp->filename);
+			_kobj_printf(ops,
+			    "krtld:\tsymndx\tvalue\t\t"
+			    "symbol name\n");
+			lastmp = mp;
 		}
-
+		sp = (Sym *)(mp->symtbl +
+		    index * mp->symhdr->sh_entsize);
+		_kobj_printf(ops, "krtld:\t[%3d]", index);
+		_kobj_printf(ops, "\t0x%lx", sp->st_value);
+		_kobj_printf(ops, "\t%s\n", name);
+	}
 #endif
+
 	for (ip = &mp->buckets[kobj_hash_name(name) % mp->hashsize]; *ip;
 	    ip = &mp->chains[*ip]) {
 		;
diff --git a/usr/src/uts/common/os/aio.c b/usr/src/uts/common/os/aio.c
index cc53f43911..35e0a4dd63 100644
--- a/usr/src/uts/common/os/aio.c
+++ b/usr/src/uts/common/os/aio.c
@@ -25,6 +25,10 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Kernel asynchronous I/O.
  * This is only for raw devices now (as of Nov. 1993).
  */
@@ -304,7 +308,7 @@ kaio(
 	offset_t	off;
 
 
-		rvp->r_vals = 0;
+	rvp->r_vals = 0;
 #if defined(_LITTLE_ENDIAN)
 	off = ((u_offset_t)uap[5] << 32) | (u_offset_t)uap[4];
 #else
diff --git a/usr/src/uts/common/os/modconf.c b/usr/src/uts/common/os/modconf.c
index 2aac71e0fc..54272275e2 100644
--- a/usr/src/uts/common/os/modconf.c
+++ b/usr/src/uts/common/os/modconf.c
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/param.h>
@@ -1336,7 +1340,7 @@ mod_installexec(struct modlexec *modl, struct modlinkage *modlp)
 	if (eswp->exec_func != NULL) {
 		printf("exec type %x is already installed\n",
 		    *eswp->exec_magic);
-			return (EBUSY);		 /* it's already there! */
+		return (EBUSY);		 /* it's already there! */
 	}
 
 	rw_enter(eswp->exec_lock, RW_WRITER);
diff --git a/usr/src/uts/common/os/streamio.c b/usr/src/uts/common/os/streamio.c
index 509a3cfd40..1786769cfb 100644
--- a/usr/src/uts/common/os/streamio.c
+++ b/usr/src/uts/common/os/streamio.c
@@ -2060,11 +2060,11 @@ strrput_nondata(queue_t *q, mblk_t *bp)
 					 * messages after it has done a
 					 * qprocsoff.
 					 */
-				if (_OTHERQ(q)->q_next == NULL)
-					freemsg(bp);
-				else
-					qreply(q, bp);
-				return (0);
+					if (_OTHERQ(q)->q_next == NULL)
+						freemsg(bp);
+					else
+						qreply(q, bp);
+					return (0);
 				}
 		}
 		freemsg(bp);
diff --git a/usr/src/uts/common/rpc/sec/authdesubr.c b/usr/src/uts/common/rpc/sec/authdesubr.c
index b4264b98e4..df71d0a491 100644
--- a/usr/src/uts/common/rpc/sec/authdesubr.c
+++ b/usr/src/uts/common/rpc/sec/authdesubr.c
@@ -23,6 +23,7 @@
  * Copyright 2014 Gary Mills
  * Copyright 2001 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
@@ -307,7 +308,7 @@ again:
 					mp2 = mp2->b_cont;
 				}
 
-			freemsg(mp);
+				freemsg(mp);
 			}
 
 			thetime = (time_t)dummy;
diff --git a/usr/src/uts/common/rpc/sec_gss/rpcsec_gss.c b/usr/src/uts/common/rpc/sec_gss/rpcsec_gss.c
index 42808c8552..5d1f8fb8c5 100644
--- a/usr/src/uts/common/rpc/sec_gss/rpcsec_gss.c
+++ b/usr/src/uts/common/rpc/sec_gss/rpcsec_gss.c
@@ -24,6 +24,10 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved.
  *
  * $Header:
@@ -277,9 +281,9 @@ rpc_gss_secget(CLIENT *clnt,
 	NOT_NULL(cr);
 	IS_ALIGNED(cr);
 #ifdef DEBUG
-if (HASH(cache_key, uid) < 0) {
-	prom_printf("cache_key %p, cr %p\n", cache_key, (void *)cr);
-}
+	if (HASH(cache_key, uid) < 0) {
+		prom_printf("cache_key %p, cr %p\n", cache_key, (void *)cr);
+	}
 #endif
 
 	/*
diff --git a/usr/src/uts/common/vm/vm_seg.c b/usr/src/uts/common/vm/vm_seg.c
index 14076ddff8..2c4d09fc03 100644
--- a/usr/src/uts/common/vm/vm_seg.c
+++ b/usr/src/uts/common/vm/vm_seg.c
@@ -21,7 +21,7 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- * Copyright (c) 2015, Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -1831,7 +1831,7 @@ seg_can_change_zones(struct seg *seg)
 		if (svd->type == MAP_SHARED &&
 		    svd->amp != NULL &&
 		    svd->amp->swresv > 0)
-		return (B_FALSE);
+			return (B_FALSE);
 	}
 	return (B_TRUE);
 }
diff --git a/usr/src/uts/i86pc/cpu/generic_cpu/gcpu_main.c b/usr/src/uts/i86pc/cpu/generic_cpu/gcpu_main.c
index 19f5284767..30ebc0e12a 100644
--- a/usr/src/uts/i86pc/cpu/generic_cpu/gcpu_main.c
+++ b/usr/src/uts/i86pc/cpu/generic_cpu/gcpu_main.c
@@ -29,6 +29,10 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * Generic x86 CPU Module
  *
  * This CPU module is used for generic x86 CPUs when Solaris has no other
@@ -269,11 +273,11 @@ gcpu_post_mpstartup(cmi_hdl_t hdl)
 	cms_post_mpstartup(hdl);
 
 #ifndef __xpv
-		/*
-		 * All cpu handles are initialized only once all cpus
-		 * are started, so we can begin polling post mp startup.
-		 */
-		gcpu_mca_poll_start(hdl);
+	/*
+	 * All cpu handles are initialized only once all cpus are started, so we
+	 * can begin polling post mp startup.
+	 */
+	gcpu_mca_poll_start(hdl);
 #endif
 }
 
diff --git a/usr/src/uts/i86pc/io/mp_platform_common.c b/usr/src/uts/i86pc/io/mp_platform_common.c
index accb951d51..c42d646204 100644
--- a/usr/src/uts/i86pc/io/mp_platform_common.c
+++ b/usr/src/uts/i86pc/io/mp_platform_common.c
@@ -22,7 +22,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2016 Nexenta Systems, Inc.
  * Copyright (c) 2017 by Delphix. All rights reserved.
- * Copyright 2017 Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 /*
  * Copyright (c) 2010, Intel Corporation.
@@ -1386,14 +1386,14 @@ apic_handle_pci_pci_bridge(dev_info_t *idip, int child_devno, int child_ipin,
 			 * found or the root is reached.
 			 */
 			ipin = (child_devno + child_ipin) % PCI_INTD;
-				if (bridge_bus == 0 && apic_pci_bus_total == 1)
-					bridge_bus = (int)apic_single_pci_busid;
-				pci_irq = ((bridge_devno & 0x1f) << 2) |
-				    (ipin & 0x3);
-				if ((*intrp = apic_find_io_intr_w_busid(pci_irq,
-				    bridge_bus)) != NULL) {
-					return (pci_irq);
-				}
+			if (bridge_bus == 0 && apic_pci_bus_total == 1)
+				bridge_bus = (int)apic_single_pci_busid;
+			pci_irq = ((bridge_devno & 0x1f) << 2) |
+			    (ipin & 0x3);
+			if ((*intrp = apic_find_io_intr_w_busid(pci_irq,
+			    bridge_bus)) != NULL) {
+				return (pci_irq);
+			}
 			dip = dipp;
 			child_devno = bridge_devno;
 			child_ipin = ipin;
diff --git a/usr/src/uts/i86pc/io/mp_platform_misc.c b/usr/src/uts/i86pc/io/mp_platform_misc.c
index b232bd5eb8..b51e7992ee 100644
--- a/usr/src/uts/i86pc/io/mp_platform_misc.c
+++ b/usr/src/uts/i86pc/io/mp_platform_misc.c
@@ -28,6 +28,10 @@
  */
 
 /*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
+/*
  * PSMI 1.1 extensions are supported only in 2.6 and later versions.
  * PSMI 1.2 extensions are supported only in 2.7 and later versions.
  * PSMI 1.3 and 1.4 extensions are supported in Solaris 10.
@@ -1897,8 +1901,8 @@ apic_check_stuck_interrupt(apic_irq_t *irq_ptr, int old_bind_cpu,
 	    (reps < apic_max_reps_clear_pending));
 
 #ifdef DEBUG
-		if (rdt_entry & AV_PENDING)
-			apic_intr_deliver_timeouts++;
+	if (rdt_entry & AV_PENDING)
+		apic_intr_deliver_timeouts++;
 #endif
 
 	/*
diff --git a/usr/src/uts/i86pc/os/cms.c b/usr/src/uts/i86pc/os/cms.c
index dd32416535..0433aeabfd 100644
--- a/usr/src/uts/i86pc/os/cms.c
+++ b/usr/src/uts/i86pc/os/cms.c
@@ -28,6 +28,10 @@
  * All rights reserved.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/cpu_module_ms_impl.h>
 #include <sys/cpuvar.h>
@@ -224,7 +228,7 @@ cms_load_modctl(modctl_t *modp)
 		    "version %d, kernel requires API version %d",
 		    modp->mod_modname, CMS_API_VERSION_TOPRINT(apiver),
 		    CMS_API_VERSION_TOPRINT(CMS_API_VERSION));
-	return (NULL);
+		return (NULL);
 	}
 
 	if ((ops = cms_getops(modp)) == NULL)
diff --git a/usr/src/uts/intel/io/dktp/disk/cmdk.c b/usr/src/uts/intel/io/dktp/disk/cmdk.c
index a3989f5746..628b0a60af 100644
--- a/usr/src/uts/intel/io/dktp/disk/cmdk.c
+++ b/usr/src/uts/intel/io/dktp/disk/cmdk.c
@@ -23,6 +23,10 @@
  * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/scsi/scsi.h>
 #include <sys/dktp/cm.h>
 #include <sys/dktp/quetypes.h>
@@ -826,7 +830,7 @@ rwcmd_copyout(struct dadkio_rwcmd *rwcmdp, caddr_t outaddr, int flag)
 		case DDI_MODEL_NONE: {
 			if (ddi_copyout(rwcmdp, outaddr,
 			    sizeof (struct dadkio_rwcmd), flag))
-			return (EFAULT);
+				return (EFAULT);
 		}
 	}
 	return (0);
diff --git a/usr/src/uts/intel/io/drm/radeon_state.c b/usr/src/uts/intel/io/drm/radeon_state.c
index 9323215254..2afd9ebf95 100644
--- a/usr/src/uts/intel/io/drm/radeon_state.c
+++ b/usr/src/uts/intel/io/drm/radeon_state.c
@@ -3,6 +3,10 @@
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 /* radeon_state.c -- State support for Radeon -*- linux-c -*- */
 /*
  * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
@@ -32,8 +36,6 @@
  *    Kevin E. Martin <martin@valinux.com>
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "drmP.h"
 #include "drm.h"
 #include "drm_sarea.h"
@@ -2244,7 +2246,7 @@ static int radeon_cp_clear(DRM_IOCTL_ARGS)
 
 	if (DRM_COPY_FROM_USER(&depth_boxes, clear.depth_boxes,
 	    sarea_priv->nbox * sizeof (depth_boxes[0])))
-	return (EFAULT);
+		return (EFAULT);
 
 	radeon_cp_dispatch_clear(dev, &clear, depth_boxes);
 
@@ -2924,10 +2926,10 @@ radeon_emit_veclinear(drm_radeon_private_t *dev_priv,
 	int start = header.veclinear.addr_lo | (header.veclinear.addr_hi << 8);
 	RING_LOCALS;
 
-		if (!sz)
-			return (0);
-		if (sz * 4 > cmdbuf->bufsz)
-			return (EINVAL);
+	if (!sz)
+		return (0);
+	if (sz * 4 > cmdbuf->bufsz)
+		return (EINVAL);
 
 	BEGIN_RING(5 + sz);
 	OUT_RING_REG(RADEON_SE_TCL_STATE_FLUSH, 0);
diff --git a/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c b/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c
index c5b79857c3..281bbf410b 100644
--- a/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c
+++ b/usr/src/uts/intel/io/intel_nhm/intel_nhmdrv.c
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/nvpair.h>
@@ -82,8 +86,8 @@ inhm_mc_snapshot_destroy()
 			continue;
 
 		kmem_free(inhm_mc_snapshot[i], inhm_mc_snapshotsz[i]);
-			inhm_mc_snapshot[i] = NULL;
-			inhm_mc_snapshotsz[i] = 0;
+		inhm_mc_snapshot[i] = NULL;
+		inhm_mc_snapshotsz[i] = 0;
 	}
 	inhm_mc_snapshotgen++;
 }