Commit b0ac2383 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp-ov2680: get rid of the type field 



This isn't really used, so get rid, in order to make the code
simpler.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 4f78f084

drivers/staging/media/atomisp/i2c/atomisp-ov2680.c

+17 −39
Original line number Diff line number Diff line
@@ -158,21 +158,9 @@ static int __ov2680_buf_reg_array(struct i2c_client *client, 
				  const struct ov2680_reg *next)

{

	int size;

	__be16 *data16;



	switch (next->type) {

	case OV2680_8BIT:

	size = 1;

	ctrl->buffer.data[ctrl->index] = (u8)next->val;

		break;

	case OV2680_16BIT:

		size = 2;

		data16 = (void *)&ctrl->buffer.data[ctrl->index];

		*data16 = cpu_to_be16((u16)next->val);

		break;

	default:

		return -EINVAL;

	}



	/* When first item is added, we need to store its starting address */

	if (ctrl->index == 0)
@@ -208,15 +196,7 @@ static int ov2680_write_reg_array(struct i2c_client *client, 
	int err;



	ctrl.index = 0;

	for (; next->type != OV2680_TOK_TERM; next++) {

		switch (next->type & OV2680_TOK_MASK) {

		case OV2680_TOK_DELAY:

			err = __ov2680_flush_reg_array(client, &ctrl);

			if (err)

				return err;

			msleep(next->val);

			break;

		default:

	for (; next->reg != 0; next++) {

		/*

		    * If next address is not consecutive, data needs to be

		    * flushed before proceed.
@@ -235,8 +215,6 @@ static int ov2680_write_reg_array(struct i2c_client *client, 
				"%s: write error, aborted\n", __func__);

			return err;

		}

			break;

		}

	}



	return __ov2680_flush_reg_array(client, &ctrl);

drivers/staging/media/atomisp/i2c/ov2680.h

+519 −529

File changed.

Preview size limit exceeded, changes collapsed.