10573 define TASKQID_INVALID as (taskq_id)0

Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Gergő Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>

7 files changed, 11 insertions, 10 deletions

diff --git a/usr/src/uts/sun4u/cpu/us3_common.c b/usr/src/uts/sun4u/cpu/us3_common.c
index 00e8e39483..22477e2a4c 100644
--- a/usr/src/uts/sun4u/cpu/us3_common.c
+++ b/usr/src/uts/sun4u/cpu/us3_common.c
@@ -6069,8 +6069,8 @@ scrub_ecache_line_intr(caddr_t arg1, caddr_t arg2)
 static void
 cpu_delayed_check_ce_errors(void *arg)
 {
-	if (!taskq_dispatch(ch_check_ce_tq, cpu_check_ce_errors, arg,
-	    TQ_NOSLEEP)) {
+	if (taskq_dispatch(ch_check_ce_tq, cpu_check_ce_errors, arg,
+	    TQ_NOSLEEP) == TASKQID_INVALID) {
 		(void) timeout(cpu_delayed_check_ce_errors, arg,
 		    drv_usectohz((clock_t)cpu_ceen_delay_secs * MICROSEC));
 	}
diff --git a/usr/src/uts/sun4u/os/plat_ecc_unum.c b/usr/src/uts/sun4u/os/plat_ecc_unum.c
index 8f694f7d6f..e13e121086 100644
--- a/usr/src/uts/sun4u/os/plat_ecc_unum.c
+++ b/usr/src/uts/sun4u/os/plat_ecc_unum.c
@@ -1044,7 +1044,7 @@ plat_ecc_dispatch_task(plat_ecc_message_t *msg)
 	ASSERT(plat_ecc_taskq != NULL);
 
 	if (taskq_dispatch(plat_ecc_taskq, plat_ecc_send_msg,
-	    (void *)msg, TQ_NOSLEEP) == NULL) {
+	    (void *)msg, TQ_NOSLEEP) == TASKQID_INVALID) {
 		kmem_free(msg->ecc_msg_data, msg->ecc_msg_len);
 		kmem_free(msg, sizeof (plat_ecc_message_t));
 		return (ENOMEM);
diff --git a/usr/src/uts/sun4u/serengeti/io/sgsbbc_mailbox.c b/usr/src/uts/sun4u/serengeti/io/sgsbbc_mailbox.c
index 63ff8515a2..efe2841c1e 100644
--- a/usr/src/uts/sun4u/serengeti/io/sgsbbc_mailbox.c
+++ b/usr/src/uts/sun4u/serengeti/io/sgsbbc_mailbox.c
@@ -2817,7 +2817,7 @@ sbbc_mbox_queue_ecc_event(sbbc_ecc_mbox_t *sbbc_ecc_msgp)
 
 	if (taskq_dispatch(sbbc_ecc_mbox_taskq,
 	    (task_func_t *)sbbc_mbox_ecc_output, sbbc_ecc_msgp,
-	    TQ_NOSLEEP) == NULL) {
+	    TQ_NOSLEEP) == TASKQID_INVALID) {
 
 		if (sbbc_ecc_mbox_taskq_errs == 0) {
 			cmn_err(CE_NOTE, "Unable to send ECC event "
diff --git a/usr/src/uts/sun4u/starcat/io/drmach.c b/usr/src/uts/sun4u/starcat/io/drmach.c
index a5966aa4ab..addcd5ce4d 100644
--- a/usr/src/uts/sun4u/starcat/io/drmach.c
+++ b/usr/src/uts/sun4u/starcat/io/drmach.c
@@ -1700,7 +1700,7 @@ drmach_mbox_event(void)
 		/* schedule a reinit handshake if one isn't pending */
 		if (!drmach_mbox_ipending) {
 			if (taskq_dispatch(system_taskq, drmach_mbox_reinit,
-			    NULL, TQ_NOSLEEP) != NULL) {
+			    NULL, TQ_NOSLEEP) != TASKQID_INVALID) {
 				drmach_mbox_ipending = 1;
 			} else {
 				cmn_err(CE_WARN,
@@ -1727,7 +1727,7 @@ drmach_mbox_event(void)
 			if (!drmach_mbox_ipending) {
 				if (taskq_dispatch(system_taskq,
 				    drmach_mbox_reinit, NULL, TQ_NOSLEEP)
-				    != NULL) {
+				    != TASKQID_INVALID) {
 					drmach_mbox_ipending = 1;
 				} else {
 					cmn_err(CE_WARN, "failed to schedule "
@@ -1889,7 +1889,7 @@ drmach_mbox_getmsg()
 			if (!drmach_mbox_ipending) {
 				if (taskq_dispatch(system_taskq,
 				    drmach_mbox_reinit, NULL, TQ_NOSLEEP)
-				    != NULL) {
+				    != TASKQID_INVALID) {
 					drmach_mbox_ipending = 1;
 				} else {
 					cmn_err(CE_WARN, "failed to schedule "
diff --git a/usr/src/uts/sun4u/starcat/io/schpc.c b/usr/src/uts/sun4u/starcat/io/schpc.c
index 921012693d..6b22e06a71 100644
--- a/usr/src/uts/sun4u/starcat/io/schpc.c
+++ b/usr/src/uts/sun4u/starcat/io/schpc.c
@@ -2699,7 +2699,7 @@ schpc_event_filter(pcimsg_t *pmsg)
 		    "event alloc'd");
 
 		if (taskq_dispatch(schpc_event_taskq, schpc_event_handler,
-		    (void *)pevent, TQ_SLEEP) == NULL) {
+		    (void *)pevent, TQ_SLEEP) == TASKQID_INVALID) {
 			cmn_err(CE_WARN, "schpc: schpc_event_filter - "
 			    "taskq_dispatch failed to enqueue event");
 			kmem_free(pevent, sizeof (pcimsg_t));
diff --git a/usr/src/uts/sun4u/starcat/io/sckmdrv.c b/usr/src/uts/sun4u/starcat/io/sckmdrv.c
index 392d961ea2..4882ece935 100644
--- a/usr/src/uts/sun4u/starcat/io/sckmdrv.c
+++ b/usr/src/uts/sun4u/starcat/io/sckmdrv.c
@@ -650,7 +650,8 @@ sckm_mbox_callback(void)
 		return;
 	}
 
-	if (!taskq_dispatch(sckm_taskq, sckm_mbox_task, NULL, KM_NOSLEEP)) {
+	if (taskq_dispatch(sckm_taskq, sckm_mbox_task, NULL, KM_NOSLEEP) ==
+	    TASKQID_INVALID) {
 		/*
 		 * Too many tasks already pending. Do not queue a new
 		 * request.
diff --git a/usr/src/uts/sun4u/starcat/io/scosmb.c b/usr/src/uts/sun4u/starcat/io/scosmb.c
index 93b99de999..597f3d91e4 100644
--- a/usr/src/uts/sun4u/starcat/io/scosmb.c
+++ b/usr/src/uts/sun4u/starcat/io/scosmb.c
@@ -1242,7 +1242,7 @@ scosmb_log_ecc_error(plat_ecc_message_type_t msg_type, void *datap)
 		 */
 		if (taskq_dispatch(scosmb_output_taskq,
 		    (task_func_t *)scosmb_process_output,
-		    (void *)msg_header_ptr, TQ_NOSLEEP) == 0) {
+		    (void *)msg_header_ptr, TQ_NOSLEEP) == TASKQID_INVALID) {
 #ifdef DEBUG
 			cmn_err(CE_WARN, "failed to dispatch a task to send "
 			    "ECC mailbox message.");