aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorErik Andrén <erik.andren@gmail.com>2008-11-27 11:52:53 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 06:39:57 -0500
commit62e856dc2fa49d3fc0b5d0b7b315236ea49c5f34 (patch)
treee6b2900fefd3b5e4c59eb0974ce6ba49776df54d /drivers/media
parent4feb24fc2643dc612b3c598c5de062cfbb08e6ea (diff)
V4L/DVB (10026): m5602: remove the s5k4aa implementation of the read_sensor
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_s5k4aa.c40
-rw-r--r--drivers/media/video/gspca/m5602/m5602_s5k4aa.h3
2 files changed, 0 insertions, 43 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
index f6fc108b4477..e564a61a72d7 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
@@ -119,46 +119,6 @@ sensor_found:
119 return 0; 119 return 0;
120} 120}
121 121
122int s5k4aa_read_sensor(struct sd *sd, const u8 address,
123 u8 *i2c_data, const u8 len)
124{
125 int err, i;
126
127 do {
128 err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
129 } while ((*i2c_data & I2C_BUSY) && !err);
130 if (err < 0)
131 goto out;
132
133 err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
134 sd->sensor->i2c_slave_id);
135 if (err < 0)
136 goto out;
137
138 err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
139 if (err < 0)
140 goto out;
141
142 err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x18 + len);
143 if (err < 0)
144 goto out;
145
146 do {
147 err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
148 } while ((*i2c_data & I2C_BUSY) && !err);
149 if (err < 0)
150 goto out;
151
152 for (i = 0; (i < len) && !err; i++) {
153 err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
154
155 PDEBUG(D_CONF, "Reading sensor register "
156 "0x%x containing 0x%x ", address, *i2c_data);
157 }
158out:
159 return err;
160}
161
162int s5k4aa_init(struct sd *sd) 122int s5k4aa_init(struct sd *sd)
163{ 123{
164 int i, err = 0; 124 int i, err = 0;
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
index a38103a88e16..1f88b0d040c4 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
@@ -67,9 +67,6 @@ int s5k4aa_probe(struct sd *sd);
67int s5k4aa_init(struct sd *sd); 67int s5k4aa_init(struct sd *sd);
68int s5k4aa_power_down(struct sd *sd); 68int s5k4aa_power_down(struct sd *sd);
69 69
70int s5k4aa_read_sensor(struct sd *sd, const u8 address,
71 u8 *i2c_data, const u8 len);
72
73int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val); 70int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
74int s5k4aa_set_exposure(struct gspca_dev *gspca_dev, __s32 val); 71int s5k4aa_set_exposure(struct gspca_dev *gspca_dev, __s32 val);
75int s5k4aa_get_vflip(struct gspca_dev *gspca_dev, __s32 *val); 72int s5k4aa_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);