Skip to content

Commit

Permalink
V4L/DVB: gspca - sonixj / sq930x / t613: Remove unused variable in st…
Browse files Browse the repository at this point in the history
…ruct 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>
  • Loading branch information
Jean-François Moine authored and Mauro Carvalho Chehab committed Aug 9, 2010
1 parent 45d7f32 commit 11ce884
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
10 changes: 5 additions & 5 deletions drivers/media/video/gspca/sonixj.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ struct sd {
#define BRIDGE_SN9C110 2
#define BRIDGE_SN9C120 3
u8 sensor; /* Type of image sensor chip */
enum {
u8 i2c_addr;

u8 jpeg_hdr[JPEG_HDR_SZ];
};
enum sensors {
SENSOR_ADCM1700,
SENSOR_GC0307,
SENSOR_HV7131R,
Expand All @@ -81,10 +85,6 @@ enum {
SENSOR_PO2030N,
SENSOR_SOI768,
SENSOR_SP80708,
} sensors;
u8 i2c_addr;

u8 jpeg_hdr[JPEG_HDR_SZ];
};

/* V4L2 controls supported by the driver */
Expand Down
12 changes: 5 additions & 7 deletions drivers/media/video/gspca/sq930x.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,17 @@ struct sd {
u8 do_ctrl;

u8 sensor;
enum {
u8 type;
#define Generic 0
#define Creative_live_motion 1
};
enum sensors {
SENSOR_ICX098BQ,
SENSOR_LZ24BP,
SENSOR_MI0360,
SENSOR_MT9V111,
SENSOR_OV7660,
SENSOR_OV9630,
} sensors;
u8 type;
#define Generic 0
#define Creative_live_motion 1

u8 jpeg_hdr[JPEG_HDR_SZ];
};

static int sd_setexpo(struct gspca_dev *gspca_dev, __s32 val);
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/video/gspca/t613.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ struct sd {
u8 effect;

u8 sensor;
enum {
};
enum sensors {
SENSOR_OM6802,
SENSOR_OTHER,
SENSOR_TAS5130A,
SENSOR_LT168G, /* must verify if this is the actual model */
} sensors;
};

/* V4L2 controls supported by the driver */
Expand Down

0 comments on commit 11ce884

Please sign in to comment.