From 08659ef75fc17a44d6ca13e842a30ef1b20d6482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Andr=C3=A9n?= <erik.andren@gmail.com>
Date: Thu, 27 Nov 2008 13:44:19 -0300
Subject: [PATCH] --- yaml --- r: 124496 b: refs/heads/master c:
 b66503e30e9f4dc137128364277a988f8b40fa80 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../media/video/gspca/m5602/m5602_ov9650.c    | 39 -------------------
 .../media/video/gspca/m5602/m5602_ov9650.h    |  3 --
 3 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/[refs] b/[refs]
index c4dcdd27a287..da3713c4e299 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 905aabafc4051a8313168b1dd20949b8108fbbb2
+refs/heads/master: b66503e30e9f4dc137128364277a988f8b40fa80
diff --git a/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.c b/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.c
index e58c84645b45..b6892aca2e34 100644
--- a/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.c
+++ b/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.c
@@ -63,45 +63,6 @@ static
 
 static void ov9650_dump_registers(struct sd *sd);
 
-int ov9650_read_sensor(struct sd *sd, const u8 address,
-		      u8 *i2c_data, const u8 len)
-{
-	int err, i;
-
-	/* The ov9650 registers have a max depth of one byte */
-	if (len > 1 || !len)
-		return -EINVAL;
-
-	do {
-		err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
-	} while ((*i2c_data & I2C_BUSY) && !err);
-
-	err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
-				 ov9650.i2c_slave_id);
-	if (err < 0)
-		goto out;
-
-	err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
-	if (err < 0)
-		goto out;
-
-	err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x10 + len);
-	if (err < 0)
-		goto out;
-
-	err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x08);
-
-	for (i = 0; (i < len) && !err; i++) {
-		err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
-
-		PDEBUG(D_CONF, "Reading sensor register "
-			       "0x%x containing 0x%x ", address, *i2c_data);
-	}
-
-out:
-	return (err < 0) ? err : 0;
-}
-
 int ov9650_probe(struct sd *sd)
 {
 	u8 prod_id = 0, ver_id = 0, i;
diff --git a/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.h b/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.h
index 1f33a7b8d6b8..3435a05aba7d 100644
--- a/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.h
+++ b/trunk/drivers/media/video/gspca/m5602/m5602_ov9650.h
@@ -126,9 +126,6 @@ int ov9650_probe(struct sd *sd);
 int ov9650_init(struct sd *sd);
 int ov9650_power_down(struct sd *sd);
 
-int ov9650_read_sensor(struct sd *sd, const u8 address,
-		       u8 *i2c_data, const u8 len);
-
 int ov9650_set_exposure(struct gspca_dev *gspca_dev, __s32 val);
 int ov9650_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
 int ov9650_get_gain(struct gspca_dev *gspca_dev, __s32 *val);