diff options
author | Erik Andrén <erik.andren@gmail.com> | 2008-11-27 11:44:19 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:39:54 -0500 |
commit | b66503e30e9f4dc137128364277a988f8b40fa80 (patch) | |
tree | 1d1b846018c9fc3f1e3416fc3c739a86458a44f4 /drivers | |
parent | 905aabafc4051a8313168b1dd20949b8108fbbb2 (diff) |
V4L/DVB (10020): m5602: Remove the ov9650 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')
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_ov9650.c | 39 | ||||
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_ov9650.h | 3 |
2 files changed, 0 insertions, 42 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.c b/drivers/media/video/gspca/m5602/m5602_ov9650.c index e58c84645b45..b6892aca2e34 100644 --- a/drivers/media/video/gspca/m5602/m5602_ov9650.c +++ b/drivers/media/video/gspca/m5602/m5602_ov9650.c | |||
@@ -63,45 +63,6 @@ static | |||
63 | 63 | ||
64 | static void ov9650_dump_registers(struct sd *sd); | 64 | static void ov9650_dump_registers(struct sd *sd); |
65 | 65 | ||
66 | int ov9650_read_sensor(struct sd *sd, const u8 address, | ||
67 | u8 *i2c_data, const u8 len) | ||
68 | { | ||
69 | int err, i; | ||
70 | |||
71 | /* The ov9650 registers have a max depth of one byte */ | ||
72 | if (len > 1 || !len) | ||
73 | return -EINVAL; | ||
74 | |||
75 | do { | ||
76 | err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data); | ||
77 | } while ((*i2c_data & I2C_BUSY) && !err); | ||
78 | |||
79 | err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR, | ||
80 | ov9650.i2c_slave_id); | ||
81 | if (err < 0) | ||
82 | goto out; | ||
83 | |||
84 | err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address); | ||
85 | if (err < 0) | ||
86 | goto out; | ||
87 | |||
88 | err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x10 + len); | ||
89 | if (err < 0) | ||
90 | goto out; | ||
91 | |||
92 | err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x08); | ||
93 | |||
94 | for (i = 0; (i < len) && !err; i++) { | ||
95 | err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i])); | ||
96 | |||
97 | PDEBUG(D_CONF, "Reading sensor register " | ||
98 | "0x%x containing 0x%x ", address, *i2c_data); | ||
99 | } | ||
100 | |||
101 | out: | ||
102 | return (err < 0) ? err : 0; | ||
103 | } | ||
104 | |||
105 | int ov9650_probe(struct sd *sd) | 66 | int ov9650_probe(struct sd *sd) |
106 | { | 67 | { |
107 | u8 prod_id = 0, ver_id = 0, i; | 68 | u8 prod_id = 0, ver_id = 0, i; |
diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.h b/drivers/media/video/gspca/m5602/m5602_ov9650.h index 1f33a7b8d6b8..3435a05aba7d 100644 --- a/drivers/media/video/gspca/m5602/m5602_ov9650.h +++ b/drivers/media/video/gspca/m5602/m5602_ov9650.h | |||
@@ -126,9 +126,6 @@ int ov9650_probe(struct sd *sd); | |||
126 | int ov9650_init(struct sd *sd); | 126 | int ov9650_init(struct sd *sd); |
127 | int ov9650_power_down(struct sd *sd); | 127 | int ov9650_power_down(struct sd *sd); |
128 | 128 | ||
129 | int ov9650_read_sensor(struct sd *sd, const u8 address, | ||
130 | u8 *i2c_data, const u8 len); | ||
131 | |||
132 | int ov9650_set_exposure(struct gspca_dev *gspca_dev, __s32 val); | 129 | int ov9650_set_exposure(struct gspca_dev *gspca_dev, __s32 val); |
133 | int ov9650_get_exposure(struct gspca_dev *gspca_dev, __s32 *val); | 130 | int ov9650_get_exposure(struct gspca_dev *gspca_dev, __s32 *val); |
134 | int ov9650_get_gain(struct gspca_dev *gspca_dev, __s32 *val); | 131 | int ov9650_get_gain(struct gspca_dev *gspca_dev, __s32 *val); |