diff options
author | Jean-François Moine <moinejf@free.fr> | 2010-07-26 05:39:40 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-08 22:42:52 -0400 |
commit | 11ce884a0df4487b9f9f9e0605a1f16321637d24 (patch) | |
tree | d1f2c5b19c7a5b5250697b98520e4e58bda86fe8 | |
parent | 45d7f32c7a43cbb9592886d38190e379e2eb2226 (diff) |
V4L/DVB: gspca - sonixj / sq930x / t613: Remove unused variable in struct sd
The sensor enum definition was not at the right place.
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/gspca/sonixj.c | 10 | ||||
-rw-r--r-- | drivers/media/video/gspca/sq930x.c | 12 | ||||
-rw-r--r-- | drivers/media/video/gspca/t613.c | 4 |
3 files changed, 12 insertions, 14 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c index ee17b034bf6b..370544361be2 100644 --- a/drivers/media/video/gspca/sonixj.c +++ b/drivers/media/video/gspca/sonixj.c | |||
@@ -66,7 +66,11 @@ struct sd { | |||
66 | #define BRIDGE_SN9C110 2 | 66 | #define BRIDGE_SN9C110 2 |
67 | #define BRIDGE_SN9C120 3 | 67 | #define BRIDGE_SN9C120 3 |
68 | u8 sensor; /* Type of image sensor chip */ | 68 | u8 sensor; /* Type of image sensor chip */ |
69 | enum { | 69 | u8 i2c_addr; |
70 | |||
71 | u8 jpeg_hdr[JPEG_HDR_SZ]; | ||
72 | }; | ||
73 | enum sensors { | ||
70 | SENSOR_ADCM1700, | 74 | SENSOR_ADCM1700, |
71 | SENSOR_GC0307, | 75 | SENSOR_GC0307, |
72 | SENSOR_HV7131R, | 76 | SENSOR_HV7131R, |
@@ -81,10 +85,6 @@ enum { | |||
81 | SENSOR_PO2030N, | 85 | SENSOR_PO2030N, |
82 | SENSOR_SOI768, | 86 | SENSOR_SOI768, |
83 | SENSOR_SP80708, | 87 | SENSOR_SP80708, |
84 | } sensors; | ||
85 | u8 i2c_addr; | ||
86 | |||
87 | u8 jpeg_hdr[JPEG_HDR_SZ]; | ||
88 | }; | 88 | }; |
89 | 89 | ||
90 | /* V4L2 controls supported by the driver */ | 90 | /* V4L2 controls supported by the driver */ |
diff --git a/drivers/media/video/gspca/sq930x.c b/drivers/media/video/gspca/sq930x.c index 37cee5e063cf..c9f367a5dbd1 100644 --- a/drivers/media/video/gspca/sq930x.c +++ b/drivers/media/video/gspca/sq930x.c | |||
@@ -49,19 +49,17 @@ struct sd { | |||
49 | u8 do_ctrl; | 49 | u8 do_ctrl; |
50 | 50 | ||
51 | u8 sensor; | 51 | u8 sensor; |
52 | enum { | 52 | u8 type; |
53 | #define Generic 0 | ||
54 | #define Creative_live_motion 1 | ||
55 | }; | ||
56 | enum sensors { | ||
53 | SENSOR_ICX098BQ, | 57 | SENSOR_ICX098BQ, |
54 | SENSOR_LZ24BP, | 58 | SENSOR_LZ24BP, |
55 | SENSOR_MI0360, | 59 | SENSOR_MI0360, |
56 | SENSOR_MT9V111, | 60 | SENSOR_MT9V111, |
57 | SENSOR_OV7660, | 61 | SENSOR_OV7660, |
58 | SENSOR_OV9630, | 62 | SENSOR_OV9630, |
59 | } sensors; | ||
60 | u8 type; | ||
61 | #define Generic 0 | ||
62 | #define Creative_live_motion 1 | ||
63 | |||
64 | u8 jpeg_hdr[JPEG_HDR_SZ]; | ||
65 | }; | 63 | }; |
66 | 64 | ||
67 | static int sd_setexpo(struct gspca_dev *gspca_dev, __s32 val); | 65 | static int sd_setexpo(struct gspca_dev *gspca_dev, __s32 val); |
diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c index 2a0f12d55e48..3b3b983f2b9d 100644 --- a/drivers/media/video/gspca/t613.c +++ b/drivers/media/video/gspca/t613.c | |||
@@ -55,12 +55,12 @@ struct sd { | |||
55 | u8 effect; | 55 | u8 effect; |
56 | 56 | ||
57 | u8 sensor; | 57 | u8 sensor; |
58 | enum { | 58 | }; |
59 | enum sensors { | ||
59 | SENSOR_OM6802, | 60 | SENSOR_OM6802, |
60 | SENSOR_OTHER, | 61 | SENSOR_OTHER, |
61 | SENSOR_TAS5130A, | 62 | SENSOR_TAS5130A, |
62 | SENSOR_LT168G, /* must verify if this is the actual model */ | 63 | SENSOR_LT168G, /* must verify if this is the actual model */ |
63 | } sensors; | ||
64 | }; | 64 | }; |
65 | 65 | ||
66 | /* V4L2 controls supported by the driver */ | 66 | /* V4L2 controls supported by the driver */ |