[10/13] DSPBRIDGE: Remove CHNL_IS_VALID_MGR and CHNL_IS_VALID_CHNL

Commit Message

Gomez Castellanos, Ivan April 9, 2010, 12:10 a.m. UTC

None

Patch

diff --git a/drivers/dsp/bridge/pmgr/chnl.c b/drivers/dsp/bridge/pmgr/chnl.c
index 6adc3c3..57b22c5 100644
--- a/drivers/dsp/bridge/pmgr/chnl.c
+++ b/drivers/dsp/bridge/pmgr/chnl.c
@@ -101,7 +101,7 @@  dsp_status chnl_create(OUT struct chnl_mgr **phChnlMgr,
 		}
 	}
 
-	DBC_ENSURE(DSP_FAILED(status) || CHNL_IS_VALID_MGR(chnl_mgr_obj));
+	DBC_ENSURE(DSP_FAILED(status) || chnl_mgr_obj);
 
 	return status;
 }
@@ -119,7 +119,7 @@  dsp_status chnl_destroy(struct chnl_mgr *hchnl_mgr)
 
 	DBC_REQUIRE(refs > 0);
 
-	if (CHNL_IS_VALID_MGR(chnl_mgr_obj)) {
+	if (chnl_mgr_obj) {
 		intf_fxns = chnl_mgr_obj->intf_fxns;
 		/* Let WMD channel module destroy the chnl_mgr: */
 		status = (*intf_fxns->pfn_chnl_destroy) (hchnl_mgr);
@@ -127,7 +127,7 @@  dsp_status chnl_destroy(struct chnl_mgr *hchnl_mgr)
 		status = DSP_EHANDLE;
 	}
 
-	DBC_ENSURE(DSP_FAILED(status) || !CHNL_IS_VALID_MGR(chnl_mgr_obj));
+	DBC_ENSURE(DSP_FAILED(status) || !chnl_mgr_obj);
 
 	return status;
 }
diff --git a/drivers/dsp/bridge/pmgr/chnlobj.h b/drivers/dsp/bridge/pmgr/chnlobj.h
index ceff374..6750273 100644
--- a/drivers/dsp/bridge/pmgr/chnlobj.h
+++ b/drivers/dsp/bridge/pmgr/chnlobj.h
@@ -23,13 +23,6 @@ 
 #include <dspbridge/chnldefs.h>
 #include <dspbridge/wmd.h>
 
-/* Object validateion macros: */
-#define CHNL_IS_VALID_MGR(h) \
-		((h != NULL) && ((h)->dw_signature == CHNL_MGRSIGNATURE))
-
-#define CHNL_IS_VALID_CHNL(h)\
-		((h != NULL) && ((h)->dw_signature == CHNL_SIGNATURE))
-
 /*
  *  This struct is the first field in a chnl_mgr struct, as implemented in
  *  a WMD channel class library.  Other, implementation specific fields