4 files changed, 14 insertions, 15 deletions

diff --git a/usr/src/uts/sun4u/sunfire/io/ac.c b/usr/src/uts/sun4u/sunfire/io/ac.c
index c19cad9264..19cf822093 100644
--- a/usr/src/uts/sun4u/sunfire/io/ac.c
+++ b/usr/src/uts/sun4u/sunfire/io/ac.c
@@ -905,8 +905,8 @@ ac_add_picN_kstats(dev_info_t *dip)
 	};
 
 	struct kstat_named *ac_pic_named_data;
-	int  		event, pic;
-	char 		pic_name[30];
+	int		event, pic;
+	char		pic_name[30];
 	int		instance = ddi_get_instance(dip);
 	int		pic_shift = 0;
 
@@ -918,7 +918,7 @@ ac_add_picN_kstats(dev_info_t *dip)
 		(void) sprintf(pic_name, "pic%d", pic);	/* pic0, pic1 ... */
 		if ((ac_picN_ksp[pic] = kstat_create("ac",
 		    instance, pic_name, "bus", KSTAT_TYPE_NAMED,
-		    AC_NUM_EVENTS + 1, NULL)) == NULL) {
+		    AC_NUM_EVENTS + 1, 0)) == NULL) {
 
 				cmn_err(CE_WARN, "ac %s: kstat_create failed",
 				    pic_name);
diff --git a/usr/src/uts/sun4u/sunfire/io/fhc.c b/usr/src/uts/sun4u/sunfire/io/fhc.c
index d47130bddc..d89eb3dfb5 100644
--- a/usr/src/uts/sun4u/sunfire/io/fhc.c
+++ b/usr/src/uts/sun4u/sunfire/io/fhc.c
@@ -245,7 +245,7 @@ short clk_danger_temp = 68;	/* Clock Board Danger Temperature */
 short dft_warn_temp = 60;	/* default warning temp value */
 short dft_danger_temp = 68;	/* default danger temp value */
 
-short cpu_warn_temp_4x = 60; 	/* CPU/Memory warning temp for 400 MHZ */
+short cpu_warn_temp_4x = 60;	/* CPU/Memory warning temp for 400 MHZ */
 short cpu_danger_temp_4x = 68;	/* CPU/Memory danger temp for 400 MHZ */
 
 /*
@@ -398,7 +398,7 @@ static struct cb_ops fhc_cb_ops = {
 	nulldev,		/* dump */
 	nulldev,		/* read */
 	nulldev,		/* write */
-	nulldev, 		/* ioctl */
+	nulldev,		/* ioctl */
 	nodev,			/* devmap */
 	nodev,			/* mmap */
 	nodev,			/* segmap */
@@ -1321,7 +1321,7 @@ done:
  */
 static void
 fhc_remove_intr_impl(dev_info_t *dip, dev_info_t *rdip,
-	ddi_intr_handle_impl_t *hdlp)
+    ddi_intr_handle_impl_t *hdlp)
 {
 	volatile uint_t *mondo_vec_reg;
 	volatile uint_t tmpreg;
@@ -1490,7 +1490,7 @@ fhc_intr_ops(dev_info_t *dip, dev_info_t *rdip, ddi_intr_op_t intr_op,
  */
 static int
 fhc_ctlops(dev_info_t *dip, dev_info_t *rdip,
-	ddi_ctl_enum_t op, void *arg, void *result)
+    ddi_ctl_enum_t op, void *arg, void *result)
 {
 
 	switch (op) {
@@ -1529,7 +1529,6 @@ fhc_ctlops(dev_info_t *dip, dev_info_t *rdip,
 /* ARGSUSED */
 static void
 fhc_xlate_intrs(ddi_intr_handle_impl_t *hdlp, uint32_t ign)
-
 {
 	uint32_t mondo;
 
@@ -2384,8 +2383,8 @@ cpu_on_board(int board)
 	int upa_a = board << 1;
 	int upa_b = (board << 1) + 1;
 
-	if ((cpunodes[upa_a].nodeid != NULL) ||
-	    (cpunodes[upa_b].nodeid != NULL)) {
+	if ((cpunodes[upa_a].nodeid != 0) ||
+	    (cpunodes[upa_b].nodeid != 0)) {
 		return (1);
 	} else {
 		return (0);
@@ -3385,7 +3384,7 @@ fhc_cpu_poweron(struct cpu *cp)
 static void
 os_completes_shutdown(void)
 {
-	pfn_t 			pfn;
+	pfn_t			pfn;
 	tte_t			tte;
 	volatile uint_t		*src;
 	volatile uint_t		*dst;
diff --git a/usr/src/uts/sun4u/sunfire/io/sysctrl.c b/usr/src/uts/sun4u/sunfire/io/sysctrl.c
index 206829b2a2..16ae450198 100644
--- a/usr/src/uts/sun4u/sunfire/io/sysctrl.c
+++ b/usr/src/uts/sun4u/sunfire/io/sysctrl.c
@@ -806,7 +806,7 @@ sysctrl_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	 * perform initialization to allow setting of powerfail-time
 	 */
 	if ((dip = ddi_find_devinfo("options", -1, 0)) == NULL)
-		softsp->options_nodeid = (pnode_t)NULL;
+		softsp->options_nodeid = (pnode_t)0;
 	else
 		softsp->options_nodeid = (pnode_t)ddi_get_nodeid(dip);
 
@@ -1218,7 +1218,7 @@ sysc_pkt_fini(sysc_cfga_pkt_t *pkt, intptr_t arg, int flag)
 /* ARGSUSED */
 static int
 sysctrl_ioctl(dev_t devt, int cmd, intptr_t arg, int flag, cred_t *cred_p,
-		int *rval_p)
+    int *rval_p)
 {
 	struct sysctrl_soft_state *softsp;
 	sysc_cfga_pkt_t sysc_pkt;
diff --git a/usr/src/uts/sun4u/sunfire/io/sysctrl_quiesce.c b/usr/src/uts/sun4u/sunfire/io/sysctrl_quiesce.c
index b9b091f759..86f576bf22 100644
--- a/usr/src/uts/sun4u/sunfire/io/sysctrl_quiesce.c
+++ b/usr/src/uts/sun4u/sunfire/io/sysctrl_quiesce.c
@@ -576,7 +576,7 @@ sysctrl_resume(sysc_cfga_pkt_t *pkt)
 		 */
 		if (sysc_watchdog_suspended) {
 			mutex_enter(&tod_lock);
-			tod_ops.tod_set_watchdog_timer(
+			(void) tod_ops.tod_set_watchdog_timer(
 			    watchdog_timeout_seconds);
 			mutex_exit(&tod_lock);
 		}
@@ -731,7 +731,7 @@ sysctrl_suspend(sysc_cfga_pkt_t *pkt)
 	 */
 	if (watchdog_activated) {
 		mutex_enter(&tod_lock);
-		tod_ops.tod_clear_watchdog_timer();
+		(void) tod_ops.tod_clear_watchdog_timer();
 		mutex_exit(&tod_lock);
 		sysc_watchdog_suspended = 1;
 	} else {