Commit b66503e3 authored by Erik Andrén's avatar Erik Andrén Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (10020): m5602: Remove the ov9650 implementation of the read sensor function 



Signed-off-by: default avatarErik Andrén <erik.andren@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 905aabaf

drivers/media/video/gspca/m5602/m5602_ov9650.c

+0 −39
Original line number Diff line number Diff line
@@ -63,45 +63,6 @@ static 


static void ov9650_dump_registers(struct sd *sd);



int ov9650_read_sensor(struct sd *sd, const u8 address,

		      u8 *i2c_data, const u8 len)

{

	int err, i;



	/* The ov9650 registers have a max depth of one byte */

	if (len > 1 || !len)

		return -EINVAL;



	do {

		err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);

	} while ((*i2c_data & I2C_BUSY) && !err);



	err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,

				 ov9650.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, 0x10 + len);

	if (err < 0)

		goto out;



	err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x08);



	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 < 0) ? err : 0;

}



int ov9650_probe(struct sd *sd)

{

	u8 prod_id = 0, ver_id = 0, i;

drivers/media/video/gspca/m5602/m5602_ov9650.h

+0 −3
Original line number Diff line number Diff line
@@ -126,9 +126,6 @@ int ov9650_probe(struct sd *sd); 
int ov9650_init(struct sd *sd);

int ov9650_power_down(struct sd *sd);



int ov9650_read_sensor(struct sd *sd, const u8 address,

		       u8 *i2c_data, const u8 len);



int ov9650_set_exposure(struct gspca_dev *gspca_dev, __s32 val);

int ov9650_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);

int ov9650_get_gain(struct gspca_dev *gspca_dev, __s32 *val);