8828 udapl: value computed is not used

Reviewed by: Yuri Pankov <yuripv@gmx.com>
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Approved by: Dan McDonald <danmcd@joyent.com>

10 files changed, 63 insertions, 65 deletions

diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_lmr_create.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_lmr_create.c
index 20db2355da..b4570e1b1f 100644
--- a/usr/src/lib/udapl/udapl_tavor/common/dapl_lmr_create.c
+++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_lmr_create.c
@@ -50,27 +50,27 @@
 
 static DAT_RETURN
 dapl_lmr_create_virtual(IN DAPL_IA *ia,
-			IN DAT_PVOID virt_addr,
-			IN DAT_VLEN length,
-			IN DAT_LMR_COOKIE shm_cookie,
-			IN DAPL_PZ *pz,
-			IN DAT_MEM_PRIV_FLAGS privileges,
-			OUT DAT_LMR_HANDLE *lmr_handle,
-			OUT DAT_LMR_CONTEXT *lmr_context,
-			OUT DAT_RMR_CONTEXT *rmr_context,
-			OUT DAT_VLEN *registered_length,
-			OUT DAT_VADDR *registered_address);
+    IN DAT_PVOID virt_addr,
+    IN DAT_VLEN length,
+    IN DAT_LMR_COOKIE shm_cookie,
+    IN DAPL_PZ *pz,
+    IN DAT_MEM_PRIV_FLAGS privileges,
+    OUT DAT_LMR_HANDLE *lmr_handle,
+    OUT DAT_LMR_CONTEXT *lmr_context,
+    OUT DAT_RMR_CONTEXT *rmr_context,
+    OUT DAT_VLEN *registered_length,
+    OUT DAT_VADDR *registered_address);
 
 static DAT_RETURN
 dapl_lmr_create_lmr(IN DAPL_IA *ia,
-		    IN DAPL_LMR *original_lmr,
-		    IN DAPL_PZ *pz,
-		    IN DAT_MEM_PRIV_FLAGS privileges,
-		    OUT DAT_LMR_HANDLE *lmr_handle,
-		    OUT DAT_LMR_CONTEXT *lmr_context,
-		    OUT DAT_RMR_CONTEXT *rmr_context,
-		    OUT DAT_VLEN *registered_length,
-		    OUT DAT_VADDR *registered_address);
+    IN DAPL_LMR *original_lmr,
+    IN DAPL_PZ *pz,
+    IN DAT_MEM_PRIV_FLAGS privileges,
+    OUT DAT_LMR_HANDLE *lmr_handle,
+    OUT DAT_LMR_CONTEXT *lmr_context,
+    OUT DAT_RMR_CONTEXT *rmr_context,
+    OUT DAT_VLEN *registered_length,
+    OUT DAT_VADDR *registered_address);
 
 /*
  * Function Definitions
@@ -78,16 +78,16 @@ dapl_lmr_create_lmr(IN DAPL_IA *ia,
 
 static DAT_RETURN
 dapl_lmr_create_virtual(IN DAPL_IA *ia,
-			IN DAT_PVOID virt_addr,
-			IN DAT_VLEN length,
-			IN DAT_LMR_COOKIE shm_cookie,
-			IN DAPL_PZ *pz,
-			IN DAT_MEM_PRIV_FLAGS privileges,
-			OUT DAT_LMR_HANDLE *lmr_handle,
-			OUT DAT_LMR_CONTEXT *lmr_context,
-			OUT DAT_RMR_CONTEXT *rmr_context,
-			OUT DAT_VLEN *registered_length,
-			OUT DAT_VADDR *registered_address)
+    IN DAT_PVOID virt_addr,
+    IN DAT_VLEN length,
+    IN DAT_LMR_COOKIE shm_cookie,
+    IN DAPL_PZ *pz,
+    IN DAT_MEM_PRIV_FLAGS privileges,
+    OUT DAT_LMR_HANDLE *lmr_handle,
+    OUT DAT_LMR_CONTEXT *lmr_context,
+    OUT DAT_RMR_CONTEXT *rmr_context,
+    OUT DAT_VLEN *registered_length,
+    OUT DAT_VADDR *registered_address)
 {
 	DAPL_LMR *lmr;
 	DAT_REGION_DESCRIPTION reg_desc;
@@ -145,7 +145,7 @@ dapl_lmr_create_virtual(IN DAPL_IA *ia,
 		goto bail;
 	}
 
-	(void) dapl_os_atomic_inc(&pz->pz_ref_count);
+	dapl_os_atomic_inc(&pz->pz_ref_count);
 
 	if (NULL != lmr_handle) {
 		*lmr_handle = (DAT_LMR_HANDLE) lmr;
@@ -170,14 +170,14 @@ bail:
 
 static DAT_RETURN
 dapl_lmr_create_lmr(IN DAPL_IA *ia,
-		    IN DAPL_LMR *original_lmr,
-		    IN DAPL_PZ *pz,
-		    IN DAT_MEM_PRIV_FLAGS privileges,
-		    OUT DAT_LMR_HANDLE *lmr_handle,
-		    OUT DAT_LMR_CONTEXT *lmr_context,
-		    OUT DAT_RMR_CONTEXT *rmr_context,
-		    OUT DAT_VLEN *registered_length,
-		    OUT DAT_VADDR *registered_address)
+    IN DAPL_LMR *original_lmr,
+    IN DAPL_PZ *pz,
+    IN DAT_MEM_PRIV_FLAGS privileges,
+    OUT DAT_LMR_HANDLE *lmr_handle,
+    OUT DAT_LMR_CONTEXT *lmr_context,
+    OUT DAT_RMR_CONTEXT *rmr_context,
+    OUT DAT_VLEN *registered_length,
+    OUT DAT_VADDR *registered_address)
 {
 	DAPL_LMR *lmr;
 	DAT_REGION_DESCRIPTION reg_desc;
@@ -246,7 +246,7 @@ dapl_lmr_create_lmr(IN DAPL_IA *ia,
 		goto bail;
 	}
 
-	(void) dapl_os_atomic_inc(&pz->pz_ref_count);
+	dapl_os_atomic_inc(&pz->pz_ref_count);
 
 	if (NULL != lmr_handle) {
 		*lmr_handle = (DAT_LMR_HANDLE)lmr;
@@ -300,16 +300,16 @@ bail:
  */
 DAT_RETURN
 dapl_lmr_create(IN DAT_IA_HANDLE ia_handle,
-		IN DAT_MEM_TYPE mem_type,
-		IN DAT_REGION_DESCRIPTION region_description,
-		IN DAT_VLEN length,
-		IN DAT_PZ_HANDLE pz_handle,
-		IN DAT_MEM_PRIV_FLAGS privileges,
-		OUT DAT_LMR_HANDLE *lmr_handle,
-		OUT DAT_LMR_CONTEXT *lmr_context,
-		OUT DAT_RMR_CONTEXT *rmr_context,
-		OUT DAT_VLEN *registered_length,
-		OUT DAT_VADDR *registered_address)
+    IN DAT_MEM_TYPE mem_type,
+    IN DAT_REGION_DESCRIPTION region_description,
+    IN DAT_VLEN length,
+    IN DAT_PZ_HANDLE pz_handle,
+    IN DAT_MEM_PRIV_FLAGS privileges,
+    OUT DAT_LMR_HANDLE *lmr_handle,
+    OUT DAT_LMR_CONTEXT *lmr_context,
+    OUT DAT_RMR_CONTEXT *rmr_context,
+    OUT DAT_VLEN *registered_length,
+    OUT DAT_VADDR *registered_address)
 {
 	DAPL_IA *ia;
 	DAPL_PZ *pz;
diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_lmr_free.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_lmr_free.c
index 62a4e6a6bf..f0d90ba56e 100644
--- a/usr/src/lib/udapl/udapl_tavor/common/dapl_lmr_free.c
+++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_lmr_free.c
@@ -98,7 +98,7 @@ dapl_lmr_free(IN DAT_LMR_HANDLE lmr_handle)
 
 		if (dat_status == DAT_SUCCESS) {
 			pz = (DAPL_PZ *) lmr->param.pz_handle;
-			(void) dapl_os_atomic_dec(&pz->pz_ref_count);
+			dapl_os_atomic_dec(&pz->pz_ref_count);
 
 			dapl_lmr_dealloc(lmr);
 		} else {
diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_osd.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_osd.c
index 8cef871034..ebe10b24e8 100644
--- a/usr/src/lib/udapl/udapl_tavor/common/dapl_osd.c
+++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_osd.c
@@ -400,7 +400,7 @@ dapls_osd_fork_cleanup(void)
 				    rmr_list_head);
 				if (rmr_ptr->param.lmr_triplet.
 				    virtual_address != 0) {
-					(void) dapl_os_atomic_dec(&rmr_ptr->
+					dapl_os_atomic_dec(&rmr_ptr->
 					    lmr->lmr_ref_count);
 					rmr_ptr->param.lmr_triplet.
 					    virtual_address = 0;
diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_psp_create.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_psp_create.c
index 63276c37ba..02692c825e 100644
--- a/usr/src/lib/udapl/udapl_tavor/common/dapl_psp_create.c
+++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_psp_create.c
@@ -161,7 +161,7 @@ dapl_psp_create(
 	/*
 	 * Take a reference on the EVD handle
 	 */
-	(void) dapl_os_atomic_inc(&((DAPL_EVD *)evd_handle)->evd_ref_count);
+	dapl_os_atomic_inc(&((DAPL_EVD *)evd_handle)->evd_ref_count);
 
 	/*
 	 * Set up a listener for a connection. Connections can arrive
diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_psp_create_any.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_psp_create_any.c
index 18ef6bba41..e73622d717 100644
--- a/usr/src/lib/udapl/udapl_tavor/common/dapl_psp_create_any.c
+++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_psp_create_any.c
@@ -144,7 +144,7 @@ dapl_psp_create_any(
 	/*
 	 * Take a reference on the EVD handle
 	 */
-	(void) dapl_os_atomic_inc(&((DAPL_EVD *)evd_handle)->evd_ref_count);
+	dapl_os_atomic_inc(&((DAPL_EVD *)evd_handle)->evd_ref_count);
 
 	/* Link it onto the IA */
 	dapl_ia_link_psp(ia_ptr, sp_ptr);
diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_bind.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_bind.c
index 69865155e3..cdf3b72a33 100644
--- a/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_bind.c
+++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_bind.c
@@ -162,11 +162,11 @@ dapli_rmr_bind_fuse(
 		goto bail;
 	}
 
-	(void) dapl_os_atomic_inc(&lmr->lmr_ref_count);
+	dapl_os_atomic_inc(&lmr->lmr_ref_count);
 
 	/* if the RMR was previously bound */
 	if (NULL != rmr->lmr) {
-		(void) dapl_os_atomic_dec(&rmr->lmr->lmr_ref_count);
+		dapl_os_atomic_dec(&rmr->lmr->lmr_ref_count);
 	}
 
 	rmr->param.mem_priv = mem_priv;
@@ -244,7 +244,7 @@ dapli_rmr_bind_unfuse(
 
 	/* if the RMR was previously bound */
 	if (NULL != rmr->lmr) {
-		(void) dapl_os_atomic_dec(&rmr->lmr->lmr_ref_count);
+		dapl_os_atomic_dec(&rmr->lmr->lmr_ref_count);
 	}
 
 	rmr->param.mem_priv = DAT_MEM_PRIV_NONE_FLAG;
diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_create.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_create.c
index 46ca8f09b0..863bab5593 100644
--- a/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_create.c
+++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_create.c
@@ -61,7 +61,7 @@
  */
 DAT_RETURN
 dapl_rmr_create(IN DAT_PZ_HANDLE pz_handle,
-		OUT DAT_RMR_HANDLE * rmr_handle)
+    OUT DAT_RMR_HANDLE * rmr_handle)
 {
 	DAPL_PZ *pz;
 	DAPL_RMR *rmr;
@@ -94,7 +94,7 @@ dapl_rmr_create(IN DAT_PZ_HANDLE pz_handle,
 		goto bail;
 	}
 
-	(void) dapl_os_atomic_inc(&pz->pz_ref_count);
+	dapl_os_atomic_inc(&pz->pz_ref_count);
 
 	*rmr_handle = rmr;
 
diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_free.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_free.c
index 781399527a..65343b4549 100644
--- a/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_free.c
+++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_free.c
@@ -80,7 +80,7 @@ dapl_rmr_free(IN DAT_RMR_HANDLE rmr_handle)
 	 * counts here.
 	 */
 	if (rmr->param.lmr_triplet.virtual_address != 0) {
-		(void) dapl_os_atomic_dec(&rmr->lmr->lmr_ref_count);
+		dapl_os_atomic_dec(&rmr->lmr->lmr_ref_count);
 		rmr->param.lmr_triplet.virtual_address = 0;
 	}
 
diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_rsp_create.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_rsp_create.c
index c9986c1d80..4e6e80ee01 100644
--- a/usr/src/lib/udapl/udapl_tavor/common/dapl_rsp_create.c
+++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_rsp_create.c
@@ -154,7 +154,7 @@ dapl_rsp_create(
 	/*
 	 * Take a reference on the EVD handle
 	 */
-	(void) dapl_os_atomic_inc(&((DAPL_EVD *)evd_handle)->evd_ref_count);
+	dapl_os_atomic_inc(&((DAPL_EVD *)evd_handle)->evd_ref_count);
 
 	/*
 	 * Update the EP state indicating the provider now owns it
diff --git a/usr/src/lib/udapl/udapl_tavor/include/dapl_osd.h b/usr/src/lib/udapl/udapl_tavor/include/dapl_osd.h
index dbed11b5e7..4754678031 100644
--- a/usr/src/lib/udapl/udapl_tavor/include/dapl_osd.h
+++ b/usr/src/lib/udapl/udapl_tavor/include/dapl_osd.h
@@ -119,21 +119,19 @@ typedef volatile DAT_COUNT DAPL_ATOMIC;
  * except that a DAT_COUNT might be 32 bits, rather than 64
  * and it occurs in local memory.
  *
- * DAT_COUNT dapl_os_atomic_inc(INOUT	DAPL_ATOMIC *v)
+ * void dapl_os_atomic_inc(INOUT	DAPL_ATOMIC *v)
  */
-#define	dapl_os_atomic_inc(v)	((DAT_COUNT)			\
-				(atomic_add_32_nv((uint32_t *)(v), 1) - 1))
+#define	dapl_os_atomic_inc(v)	atomic_add_32((uint32_t *)(v), 1)
 
 /*
  * dapl_os_atomic_dec
  *
  * decrement the current value of '*v'. No return value is required.
  *
- * DAT_COUNT dapl_os_atomic_dec(INOUT	DAPL_ATOMIC *v)
+ * void dapl_os_atomic_dec(INOUT	DAPL_ATOMIC *v)
  */
 #define	dapl_os_atomic_dec(v)	assert(*v != 0);		\
-				((DAT_COUNT)			\
-				(atomic_add_32_nv((uint32_t *)(v), -1) + 1))
+				atomic_add_32((uint32_t *)(v), -1)
 
 /*
  * dapl_os_atomic_assign