Commit dc913258 authored by Erik Andr?n's avatar Erik Andr?n Committed by Mauro Carvalho Chehab

V4L/DVB (11407): gspca - m5602-ov9650: Clean up ov9650_start() function.

Cleans some unnecessary temporary variable usage in the ov9650 start function.
Signed-off-by: default avatarErik Andr?n <erik.andren@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e31f9dd6
...@@ -147,10 +147,8 @@ int ov9650_start(struct sd *sd) ...@@ -147,10 +147,8 @@ int ov9650_start(struct sd *sd)
int i, err = 0; int i, err = 0;
struct cam *cam = &sd->gspca_dev.cam; struct cam *cam = &sd->gspca_dev.cam;
for (i = 0; i < ARRAY_SIZE(res_init_ov9650) && !err; i++) { for (i = 0; i < ARRAY_SIZE(res_init_ov9650) && !err; i++)
u8 data = res_init_ov9650[i][1]; err = m5602_write_bridge(sd, res_init_ov9650[i][0], res_init_ov9650[i][1]);
err = m5602_write_bridge(sd, res_init_ov9650[i][0], data);
}
if (err < 0) if (err < 0)
return err; return err;
...@@ -160,12 +158,14 @@ int ov9650_start(struct sd *sd) ...@@ -160,12 +158,14 @@ int ov9650_start(struct sd *sd)
PDEBUG(D_V4L2, "Configuring camera for VGA mode"); PDEBUG(D_V4L2, "Configuring camera for VGA mode");
for (i = 0; i < ARRAY_SIZE(VGA_ov9650) && !err; i++) { for (i = 0; i < ARRAY_SIZE(VGA_ov9650) && !err; i++) {
if (VGA_ov9650[i][0] == SENSOR) {
u8 data = VGA_ov9650[i][2]; u8 data = VGA_ov9650[i][2];
if (VGA_ov9650[i][0] == SENSOR)
err = m5602_write_sensor(sd, err = m5602_write_sensor(sd,
VGA_ov9650[i][1], &data, 1); VGA_ov9650[i][1], &data, 1);
else } else {
err = m5602_write_bridge(sd, VGA_ov9650[i][1], data); err = m5602_write_bridge(sd, VGA_ov9650[i][1], VGA_ov9650[i][2]);
}
} }
break; break;
...@@ -173,12 +173,14 @@ int ov9650_start(struct sd *sd) ...@@ -173,12 +173,14 @@ int ov9650_start(struct sd *sd)
PDEBUG(D_V4L2, "Configuring camera for CIF mode"); PDEBUG(D_V4L2, "Configuring camera for CIF mode");
for (i = 0; i < ARRAY_SIZE(CIF_ov9650) && !err; i++) { for (i = 0; i < ARRAY_SIZE(CIF_ov9650) && !err; i++) {
if (CIF_ov9650[i][0] == SENSOR) {
u8 data = CIF_ov9650[i][2]; u8 data = CIF_ov9650[i][2];
if (CIF_ov9650[i][0] == SENSOR)
err = m5602_write_sensor(sd, err = m5602_write_sensor(sd,
CIF_ov9650[i][1], &data, 1); CIF_ov9650[i][1], &data, 1);
else } else {
err = m5602_write_bridge(sd, CIF_ov9650[i][1], data); err = m5602_write_bridge(sd, CIF_ov9650[i][1], CIF_ov9650[i][2]);
}
} }
break; break;
...@@ -186,12 +188,14 @@ int ov9650_start(struct sd *sd) ...@@ -186,12 +188,14 @@ int ov9650_start(struct sd *sd)
PDEBUG(D_V4L2, "Configuring camera for QVGA mode"); PDEBUG(D_V4L2, "Configuring camera for QVGA mode");
for (i = 0; i < ARRAY_SIZE(QVGA_ov9650) && !err; i++) { for (i = 0; i < ARRAY_SIZE(QVGA_ov9650) && !err; i++) {
if (QVGA_ov9650[i][0] == SENSOR) {
u8 data = QVGA_ov9650[i][2]; u8 data = QVGA_ov9650[i][2];
if (QVGA_ov9650[i][0] == SENSOR)
err = m5602_write_sensor(sd, err = m5602_write_sensor(sd,
QVGA_ov9650[i][1], &data, 1); QVGA_ov9650[i][1], &data, 1);
else } else {
err = m5602_write_bridge(sd, QVGA_ov9650[i][1], data); err = m5602_write_bridge(sd, QVGA_ov9650[i][1], QVGA_ov9650[i][2]);
}
} }
break; break;
...@@ -199,12 +203,13 @@ int ov9650_start(struct sd *sd) ...@@ -199,12 +203,13 @@ int ov9650_start(struct sd *sd)
PDEBUG(D_V4L2, "Configuring camera for QCIF mode"); PDEBUG(D_V4L2, "Configuring camera for QCIF mode");
for (i = 0; i < ARRAY_SIZE(QCIF_ov9650) && !err; i++) { for (i = 0; i < ARRAY_SIZE(QCIF_ov9650) && !err; i++) {
if (QCIF_ov9650[i][0] == SENSOR) {
u8 data = QCIF_ov9650[i][2]; u8 data = QCIF_ov9650[i][2];
if (QCIF_ov9650[i][0] == SENSOR)
err = m5602_write_sensor(sd, err = m5602_write_sensor(sd,
QCIF_ov9650[i][1], &data, 1); QCIF_ov9650[i][1], &data, 1);
else } else {
err = m5602_write_bridge(sd, QCIF_ov9650[i][1], data); err = m5602_write_bridge(sd, QCIF_ov9650[i][1], QCIF_ov9650[i][2]);
}
} }
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment