Skip to content

Commit

Permalink
V4L/DVB (10026): m5602: remove the s5k4aa implementation of the read_…
Browse files Browse the repository at this point in the history
…sensor

Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Erik Andrén authored and Mauro Carvalho Chehab committed Dec 30, 2008
1 parent 4feb24f commit 62e856d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 43 deletions.
40 changes: 0 additions & 40 deletions drivers/media/video/gspca/m5602/m5602_s5k4aa.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,46 +119,6 @@ int s5k4aa_probe(struct sd *sd)
return 0;
}

int s5k4aa_read_sensor(struct sd *sd, const u8 address,
u8 *i2c_data, const u8 len)
{
int err, i;

do {
err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
} while ((*i2c_data & I2C_BUSY) && !err);
if (err < 0)
goto out;

err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
sd->sensor->i2c_slave_id);
if (err < 0)
goto out;

err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
if (err < 0)
goto out;

err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x18 + len);
if (err < 0)
goto out;

do {
err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
} while ((*i2c_data & I2C_BUSY) && !err);
if (err < 0)
goto out;

for (i = 0; (i < len) && !err; i++) {
err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));

PDEBUG(D_CONF, "Reading sensor register "
"0x%x containing 0x%x ", address, *i2c_data);
}
out:
return err;
}

int s5k4aa_init(struct sd *sd)
{
int i, err = 0;
Expand Down
3 changes: 0 additions & 3 deletions drivers/media/video/gspca/m5602/m5602_s5k4aa.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ int s5k4aa_probe(struct sd *sd);
int s5k4aa_init(struct sd *sd);
int s5k4aa_power_down(struct sd *sd);

int s5k4aa_read_sensor(struct sd *sd, const u8 address,
u8 *i2c_data, const u8 len);

int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
int s5k4aa_set_exposure(struct gspca_dev *gspca_dev, __s32 val);
int s5k4aa_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
Expand Down

0 comments on commit 62e856d

Please sign in to comment.