diff options
author | Erik Andrén <erik.andren@gmail.com> | 2008-11-27 11:50:17 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:39:56 -0500 |
commit | f1c6171c4b7b2882a67db6a24c8699fa0efab42f (patch) | |
tree | 21a92a65d3516eb2d61f0b70a0fec18c7b408ba7 /drivers/media | |
parent | 4f93c450e8320d906ae50c75f2c8696516b5ccf3 (diff) |
V4L/DVB (10024): m5602: Remove the mt9m111 implementation of the read_sensor function.
Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_mt9m111.c | 33 | ||||
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_mt9m111.h | 3 |
2 files changed, 0 insertions, 36 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.c b/drivers/media/video/gspca/m5602/m5602_mt9m111.c index 0a4158f57ad3..c0e71c331454 100644 --- a/drivers/media/video/gspca/m5602/m5602_mt9m111.c +++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.c | |||
@@ -233,39 +233,6 @@ out: | |||
233 | return err; | 233 | return err; |
234 | } | 234 | } |
235 | 235 | ||
236 | int mt9m111_read_sensor(struct sd *sd, const u8 address, | ||
237 | u8 *i2c_data, const u8 len) { | ||
238 | int err, i; | ||
239 | |||
240 | do { | ||
241 | err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data); | ||
242 | } while ((*i2c_data & I2C_BUSY) && !err); | ||
243 | if (err < 0) | ||
244 | goto out; | ||
245 | |||
246 | err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR, | ||
247 | sd->sensor->i2c_slave_id); | ||
248 | if (err < 0) | ||
249 | goto out; | ||
250 | |||
251 | err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address); | ||
252 | if (err < 0) | ||
253 | goto out; | ||
254 | |||
255 | err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x1a); | ||
256 | if (err < 0) | ||
257 | goto out; | ||
258 | |||
259 | for (i = 0; i < len && !err; i++) { | ||
260 | err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i])); | ||
261 | |||
262 | PDEBUG(D_CONF, "Reading sensor register " | ||
263 | "0x%x contains 0x%x ", address, *i2c_data); | ||
264 | } | ||
265 | out: | ||
266 | return err; | ||
267 | } | ||
268 | |||
269 | static void mt9m111_dump_registers(struct sd *sd) | 236 | static void mt9m111_dump_registers(struct sd *sd) |
270 | { | 237 | { |
271 | u8 address, value[2] = {0x00, 0x00}; | 238 | u8 address, value[2] = {0x00, 0x00}; |
diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.h b/drivers/media/video/gspca/m5602/m5602_mt9m111.h index 763b17ee617c..c5f75aa59f54 100644 --- a/drivers/media/video/gspca/m5602/m5602_mt9m111.h +++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.h | |||
@@ -87,9 +87,6 @@ int mt9m111_probe(struct sd *sd); | |||
87 | int mt9m111_init(struct sd *sd); | 87 | int mt9m111_init(struct sd *sd); |
88 | int mt9m111_power_down(struct sd *sd); | 88 | int mt9m111_power_down(struct sd *sd); |
89 | 89 | ||
90 | int mt9m111_read_sensor(struct sd *sd, const u8 address, | ||
91 | u8 *i2c_data, const u8 len); | ||
92 | |||
93 | int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val); | 90 | int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val); |
94 | int mt9m111_get_vflip(struct gspca_dev *gspca_dev, __s32 *val); | 91 | int mt9m111_get_vflip(struct gspca_dev *gspca_dev, __s32 *val); |
95 | int mt9m111_get_hflip(struct gspca_dev *gspca_dev, __s32 *val); | 92 | int mt9m111_get_hflip(struct gspca_dev *gspca_dev, __s32 *val); |