---

yaml --- r: 197286 b: refs/heads/master c: 2342df0 h: refs/heads/master v: v3
git-mirror · May 11, 2010 · c2ee70f · c2ee70f
1 parent ccd69f3
commit c2ee70f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ec21181d22891ecebcd01075a819a4373c54362
+refs/heads/master: 2342df0e63f4ca9a4227ea06f951f09180497914
diff --git a/trunk/drivers/staging/dt3155v4l/dt3155v4l.c b/trunk/drivers/staging/dt3155v4l/dt3155v4l.c
@@ -65,7 +65,7 @@ static u8 config_init = ACQ_MODE_EVEN;
  * in a byte pointed by data.
  */
 static int
-read_i2c_reg(void *addr, u8 index, u8 *data)
+read_i2c_reg(void __iomem *addr, u8 index, u8 *data)
 {
 	u32 tmp = index;
 
@@ -102,7 +102,7 @@ read_i2c_reg(void *addr, u8 index, u8 *data)
  * and busy waits for the process to finish.
  */
 static int
-write_i2c_reg(void *addr, u8 index, u8 data)
+write_i2c_reg(void __iomem *addr, u8 index, u8 data)
 {
 	u32 tmp = index;
 
@@ -134,8 +134,7 @@ write_i2c_reg(void *addr, u8 index, u8 data)
  * This function starts writting the specified (by index) register
  * and then returns.
  */
-void
-write_i2c_reg_nowait(void *addr, u8 index, u8 data)
+static void write_i2c_reg_nowait(void __iomem *addr, u8 index, u8 data)
 {
 	u32 tmp = index;
 
@@ -152,8 +151,7 @@ write_i2c_reg_nowait(void *addr, u8 index, u8 data)
  *
  * This function waits reading/writting to finish.
  */
-static int
-wait_i2c_reg(void *addr)
+static int wait_i2c_reg(void __iomem *addr)
 {
 	if (ioread32(addr + IIC_CSR2) & NEW_CYCLE)
 		udelay(65); /* wait at least 63 usec for NEW_CYCLE to clear */