X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fckrm_rc.h;h=b46cfd9f3318c6ef07dad91eea029dbe416c0bb1;hb=1be35e94e1da3669db492995cd2c8b1a37016b11;hp=1bf2d07b5365f06bbd5f76cf85102696796fdb93;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/include/linux/ckrm_rc.h b/include/linux/ckrm_rc.h
index 1bf2d07b5..b46cfd9f3 100644
--- a/include/linux/ckrm_rc.h
+++ b/include/linux/ckrm_rc.h
@@ -132,7 +132,7 @@ typedef struct ckrm_classtype {
 	int num_classes;	 
 
 	/* state about my ce interaction */
-	atomic_t ce_regd;		// if CE registered
+	int ce_regd;		// if CE registered
 	int ce_cb_active;	// if Callbacks active
 	atomic_t ce_nr_users;	// number of active transient calls 
 	struct ckrm_eng_callback ce_callbacks;	// callback engine
@@ -223,11 +223,7 @@ typedef struct ckrm_core_class {
  * OTHER
  ******************************************************************************/
 
-#define ckrm_get_res_class(rescls, resid, type) \
-	((type*) (((resid != -1) && ((rescls) != NULL) \
-			   && ((rescls) != (void *)-1)) ? \
-	 ((struct ckrm_core_class *)(rescls))->res_class[resid] : NULL))
-
+#define ckrm_get_res_class(rescls,resid,type)   ((type*)((rescls)->res_class[resid]))
 
 extern int ckrm_register_res_ctlr(struct ckrm_classtype *, ckrm_res_ctlr_t *);
 extern int ckrm_unregister_res_ctlr(ckrm_res_ctlr_t *);