aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorErik Andrén <erik.andren@gmail.com>2008-11-27 11:55:07 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 06:39:58 -0500
commit83fdea270ca5a648185525f61d27c9068355215c (patch)
tree5a75e8aacf34390c352ae0007e50d88bb402a9cc /drivers/media
parent6b9c0a2aad5a64ee7eb605e35bc761d901782d25 (diff)
V4L/DVB (10028): mt5602: Remove the s5k83a specific 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_s5k83a.c37
-rw-r--r--drivers/media/video/gspca/m5602/m5602_s5k83a.h3
2 files changed, 0 insertions, 40 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.c b/drivers/media/video/gspca/m5602/m5602_s5k83a.c
index 811766b3269..af3f2dc2c70 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k83a.c
+++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.c
@@ -70,43 +70,6 @@ sensor_found:
70 return 0; 70 return 0;
71} 71}
72 72
73int s5k83a_read_sensor(struct sd *sd, const u8 address,
74 u8 *i2c_data, const u8 len)
75{
76 int err, i;
77
78 do {
79 err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
80 } while ((*i2c_data & I2C_BUSY) && !err);
81 if (err < 0)
82 goto out;
83
84 err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
85 sd->sensor->i2c_slave_id);
86 if (err < 0)
87 goto out;
88
89 err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
90 if (err < 0)
91 goto out;
92
93 err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x18 + len);
94
95 do {
96 err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
97 } while ((*i2c_data & I2C_BUSY) && !err);
98
99 for (i = 0; i < len && !len; i++) {
100 err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
101
102 PDEBUG(D_CONF, "Reading sensor register "
103 "0x%x containing 0x%x ", address, *i2c_data);
104 }
105
106out:
107 return err;
108}
109
110int s5k83a_init(struct sd *sd) 73int s5k83a_init(struct sd *sd)
111{ 74{
112 int i, err = 0; 75 int i, err = 0;
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.h b/drivers/media/video/gspca/m5602/m5602_s5k83a.h
index 73570112796..05ccb5b57a8 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k83a.h
+++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.h
@@ -46,9 +46,6 @@ int s5k83a_probe(struct sd *sd);
46int s5k83a_init(struct sd *sd); 46int s5k83a_init(struct sd *sd);
47int s5k83a_power_down(struct sd *sd); 47int s5k83a_power_down(struct sd *sd);
48 48
49int s5k83a_read_sensor(struct sd *sd, const u8 address,
50 u8 *i2c_data, const u8 len);
51
52int s5k83a_set_brightness(struct gspca_dev *gspca_dev, __s32 val); 49int s5k83a_set_brightness(struct gspca_dev *gspca_dev, __s32 val);
53int s5k83a_get_brightness(struct gspca_dev *gspca_dev, __s32 *val); 50int s5k83a_get_brightness(struct gspca_dev *gspca_dev, __s32 *val);
54int s5k83a_set_whiteness(struct gspca_dev *gspca_dev, __s32 val); 51int s5k83a_set_whiteness(struct gspca_dev *gspca_dev, __s32 val);