From: Antti Laakso <antti.laakso@intel.com>
Date: Wed, 21 Mar 2012 15:40:28 +0000 (+0200)
Subject: mt9m114: removing compiler warnings from mt9m114
X-Git-Tag: 2.1b_release~1173
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8cf71f24dac1b282fb7c7b4c1239fa26a63ed110;p=kernel%2Fkernel-mfld-blackbay.git

mt9m114: removing compiler warnings from mt9m114

BZ:26628

Removing compiler warnings from mt9m114

Change-Id: Ib4fdcabc7b49fa096a07781aa8995f3db970d0af
Signed-off-by: Antti Laakso <antti.laakso@intel.com>
Reviewed-on: http://android.intel.com:8080/39995
Reviewed-by: Koski, Anttu <anttu.koski@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: Shevchenko, Andriy <andriy.shevchenko@intel.com>
Reviewed-by: Kruger, Jozef <jozef.kruger@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
---

diff --git a/drivers/media/video/mt9m114.c b/drivers/media/video/mt9m114.c
index 1b3f639..65f0cbb 100644
--- a/drivers/media/video/mt9m114.c
+++ b/drivers/media/video/mt9m114.c
@@ -183,7 +183,8 @@ again:
  * Read/modify/write a value to a register in the  sensor device.
  * Returns zero if successful, or non-zero otherwise.
  */
-int misensor_rmw_reg(struct i2c_client *client, u16 data_length, u16 reg,
+static int
+misensor_rmw_reg(struct i2c_client *client, u16 data_length, u16 reg,
 		     u32 mask, u32 set)
 {
 	int err;
@@ -418,7 +419,8 @@ static int mt9m114_wait_3a(struct v4l2_subdev *sd)
 {
 	struct i2c_client *client = v4l2_get_subdevdata(sd);
 	int timeout = 35;
-	int status_exp, status_wb, ret;
+	int ret;
+	unsigned int status_exp, status_wb;
 
 	while (timeout--) {
 		ret = mt9m114_read_reg(client, MISENSOR_16BIT,
@@ -446,7 +448,8 @@ static int mt9m114_wait_3a(struct v4l2_subdev *sd)
 
 static int mt9m114_wait_state(struct i2c_client *client, int timeout)
 {
-	int val, ret;
+	int ret;
+	unsigned int val;
 
 	while (timeout-- > 0) {
 		ret = mt9m114_read_reg(client, MISENSOR_16BIT, 0x0080, &val);