From: Pavel Chupin <pavel.v.chupin@intel.com>
Date: Thu, 26 Apr 2012 13:30:49 +0000 (+0400)
Subject: gcc4.6: TEMPORARY fix for enums compare issue
X-Git-Tag: 2.1b_release~865
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=202f5d82a68000264195235946556fcad65ac746;p=kernel%2Fkernel-mfld-blackbay.git

gcc4.6: TEMPORARY fix for enums compare issue

BZ: 33304

There is different types of enums comparison 'enum atomisp_acc_arg_type'
and 'enum sh_css_acc_arg_type' and gcc4.6 produce a warning which is
treated as error. This is TEMPORARY patch to remove the warning until
these enums fixed.

Change-Id: Ib18d29a596aae3c5a93b436ffa490f6a8a5b2c49
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Reviewed-on: http://android.intel.com:8080/45961
Reviewed-by: Lu, Hongjiu <hongjiu.lu@intel.com>
Reviewed-by: Yin, Fengwei <fengwei.yin@intel.com>
Reviewed-by: Li, XiaojingX <xiaojingx.li@intel.com>
Tested-by: Li, XiaojingX <xiaojingx.li@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
---

diff --git a/drivers/media/video/atomisp/atomisp_cmd.c b/drivers/media/video/atomisp/atomisp_cmd.c
index 922ab54..9f8a510 100644
--- a/drivers/media/video/atomisp/atomisp_cmd.c
+++ b/drivers/media/video/atomisp/atomisp_cmd.c
@@ -3933,9 +3933,9 @@ int atomisp_acc_set_arg(struct atomisp_device *isp,
 		pgnr = DIV_ROUND_UP(size, PAGE_SIZE);
 
 		frame_ptr = hrt_isp_css_mm_alloc_user_ptr(size,
-					(unsigned int __force)fw_arg->value,
-					pgnr,
-					type != SH_CSS_ACC_ARG_PTR_NOFLUSH);
+				(unsigned int __force)fw_arg->value,
+				pgnr,
+				(int)type != SH_CSS_ACC_ARG_PTR_NOFLUSH);
 
 		if (IS_ERR_OR_NULL(frame_ptr)) {
 			v4l2_err(&atomisp_dev, "%s: Failed to allocate frame "
@@ -4052,7 +4052,7 @@ int atomisp_acc_start(struct atomisp_device *isp, unsigned int *handle)
 	}
 
 	/* Initialize the interrupt here if it's a standalone binary */
-	if (fw->header.type == ATOMISP_ACC_STANDALONE)
+	if ((int)fw->header.type == ATOMISP_ACC_STANDALONE)
 		INIT_COMPLETION(isp->acc_fw_complete);
 
 out:
@@ -4078,7 +4078,7 @@ int atomisp_acc_wait(struct atomisp_device *isp, unsigned int *handle)
 		goto out;
 	}
 
-	if (fw->header.type != ATOMISP_ACC_STANDALONE) {
+	if ((int)fw->header.type != ATOMISP_ACC_STANDALONE) {
 		ret = -EINVAL;
 		goto out;
 	}