summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
diff options
context:
space:
mode:
authorErik Andr?n <erik.andren@gmail.com>2008-12-30 15:27:17 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-06 21:44:39 -0300
commite4cc4fcc7b85ec32f05343b02229492c06baba1a (patch)
treeb2e3eaea31ec971963dc6532d14521882eec1d3c /drivers/media/video/gspca/m5602/m5602_s5k4aa.h
parente335f224e35f413775a549889318afe6bd0342b0 (diff)
downloadblackbird-op-linux-e4cc4fcc7b85ec32f05343b02229492c06baba1a.tar.gz
blackbird-op-linux-e4cc4fcc7b85ec32f05343b02229492c06baba1a.zip
V4L/DVB (11411): gspca - m5602: Rework v4l ctrl handling in all sensors
Previously, all sensors allocated a part of a large ctrl vector. Define this vector separately for each sensor instead. Signed-off-by: Erik Andrén <erik.andren@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/m5602/m5602_s5k4aa.h')
-rw-r--r--drivers/media/video/gspca/m5602/m5602_s5k4aa.h23
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
index 0c08ccffc7ff..33ba1621bc69 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.h
@@ -77,16 +77,7 @@ int s5k4aa_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
int s5k4aa_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
int s5k4aa_set_gain(struct gspca_dev *gspca_dev, __s32 val);
-static struct m5602_sensor s5k4aa = {
- .name = "S5K4AA",
- .probe = s5k4aa_probe,
- .init = s5k4aa_init,
- .start = s5k4aa_start,
- .power_down = s5k4aa_power_down,
- .i2c_slave_id = 0x5a,
- .i2c_regW = 2,
- .nctrls = 4,
- .ctrls = {
+static struct ctrl s5k4aa_ctrls[] = {
{
{
.id = V4L2_CID_VFLIP,
@@ -140,7 +131,17 @@ static struct m5602_sensor s5k4aa = {
.set = s5k4aa_set_exposure,
.get = s5k4aa_get_exposure
}
- },
+};
+
+static struct m5602_sensor s5k4aa = {
+ .name = "S5K4AA",
+ .probe = s5k4aa_probe,
+ .init = s5k4aa_init,
+ .start = s5k4aa_start,
+ .power_down = s5k4aa_power_down,
+ .i2c_slave_id = 0x5a,
+ .i2c_regW = 2,
+ .ctrls = s5k4aa_ctrls,
.nmodes = 1,
.modes = {
OpenPOWER on IntegriCloud