---

yaml --- r: 76398 b: refs/heads/master c: f760d61 h: refs/heads/master v: v3
git-mirror · Jan 25, 2008 · e7ddf66 · e7ddf66
1 parent e05a51a
commit e7ddf66
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2fbaa519befdb3db2485116518f3af55be604e6
+refs/heads/master: f760d618ab385e1c4060f1bfebc335971a5b79f4
diff --git a/trunk/drivers/media/video/et61x251/et61x251_core.c b/trunk/drivers/media/video/et61x251/et61x251_core.c
@@ -227,7 +227,7 @@ int et61x251_write_reg(struct et61x251_device* cam, u8 value, u16 index)
 }
 
 
-int et61x251_read_reg(struct et61x251_device* cam, u16 index)
+static int et61x251_read_reg(struct et61x251_device* cam, u16 index)
 {
 	struct usb_device* udev = cam->usbdev;
 	u8* buff = cam->control_buffer;
@@ -268,9 +268,9 @@ et61x251_i2c_wait(struct et61x251_device* cam,
 }
 
 
-int
-et61x251_i2c_try_read(struct et61x251_device* cam,
-		      const struct et61x251_sensor* sensor, u8 address)
+static int et61x251_i2c_try_read(struct et61x251_device* cam,
+				 const struct et61x251_sensor* sensor,
+				 u8 address)
 {
 	struct usb_device* udev = cam->usbdev;
 	u8* data = cam->control_buffer;
@@ -301,10 +301,9 @@ et61x251_i2c_try_read(struct et61x251_device* cam,
 }
 
 
-int
-et61x251_i2c_try_write(struct et61x251_device* cam,
-		       const struct et61x251_sensor* sensor, u8 address,
-		       u8 value)
+static int et61x251_i2c_try_write(struct et61x251_device* cam,
+				  const struct et61x251_sensor* sensor,
+				  u8 address, u8 value)
 {
 	struct usb_device* udev = cam->usbdev;
 	u8* data = cam->control_buffer;
@@ -387,13 +386,14 @@ et61x251_i2c_raw_write(struct et61x251_device* cam, u8 n, u8 data1, u8 data2,
 }
 
 
-int et61x251_i2c_read(struct et61x251_device* cam, u8 address)
+static int et61x251_i2c_read(struct et61x251_device* cam, u8 address)
 {
 	return et61x251_i2c_try_read(cam, &cam->sensor, address);
 }
 
 
-int et61x251_i2c_write(struct et61x251_device* cam, u8 address, u8 value)
+static int et61x251_i2c_write(struct et61x251_device* cam,
+			      u8 address, u8 value)
 {
 	return et61x251_i2c_try_write(cam, &cam->sensor, address, value);
 }

diff --git a/trunk/drivers/media/video/et61x251/et61x251_sensor.h b/trunk/drivers/media/video/et61x251/et61x251_sensor.h
@@ -52,14 +52,6 @@ et61x251_attach_sensor(struct et61x251_device* cam,
 /*****************************************************************************/
 
 extern int et61x251_write_reg(struct et61x251_device*, u8 value, u16 index);
-extern int et61x251_read_reg(struct et61x251_device*, u16 index);
-extern int et61x251_i2c_write(struct et61x251_device*, u8 address, u8 value);
-extern int et61x251_i2c_read(struct et61x251_device*, u8 address);
-extern int et61x251_i2c_try_write(struct et61x251_device*,
-				  const struct et61x251_sensor*, u8 address,
-				  u8 value);
-extern int et61x251_i2c_try_read(struct et61x251_device*,
-				 const struct et61x251_sensor*, u8 address);
 extern int et61x251_i2c_raw_write(struct et61x251_device*, u8 n, u8 data1,
 				  u8 data2, u8 data3, u8 data4, u8 data5,
 				  u8 data6, u8 data7, u8 data8, u8 address);