Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2020-05-19 17:31:50 +02:00
parent 4f78f0840f
commit b0ac238396
2 changed files with 535 additions and 567 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
View File

@ -158,21 +158,9 @@ static int __ov2680_buf_reg_array(struct i2c_client *client,
const struct ov2680_reg *next) const struct ov2680_reg *next)
{ {
int size; int size;
__be16 *data16;
switch (next->type) { size = 1;
case OV2680_8BIT: ctrl->buffer.data[ctrl->index] = (u8)next->val;
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 */ /* When first item is added, we need to store its starting address */
if (ctrl->index == 0) if (ctrl->index == 0)
@ -208,34 +196,24 @@ static int ov2680_write_reg_array(struct i2c_client *client,
int err; int err;
ctrl.index = 0; ctrl.index = 0;
for (; next->type != OV2680_TOK_TERM; next++) { for (; next->reg != 0; next++) {
switch (next->type & OV2680_TOK_MASK) { /*
case OV2680_TOK_DELAY: * If next address is not consecutive, data needs to be
* flushed before proceed.
*/
dev_dbg(&client->dev, "%s: reg=0x%02x set to 0x%02x\n",
__func__, next->reg, next->val);
if (!__ov2680_write_reg_is_consecutive(client, &ctrl,
next)) {
err = __ov2680_flush_reg_array(client, &ctrl); err = __ov2680_flush_reg_array(client, &ctrl);
if (err) if (err)
return err; return err;
msleep(next->val); }
break; err = __ov2680_buf_reg_array(client, &ctrl, next);
default: if (err) {
/* dev_err(&client->dev,
* If next address is not consecutive, data needs to be "%s: write error, aborted\n", __func__);
* flushed before proceed. return err;
*/
dev_dbg(&client->dev, "%s: reg=0x%02x set to 0x%02x\n",
__func__, next->reg, next->val);
if (!__ov2680_write_reg_is_consecutive(client, &ctrl,
next)) {
err = __ov2680_flush_reg_array(client, &ctrl);
if (err)
return err;
}
err = __ov2680_buf_reg_array(client, &ctrl, next);
if (err) {
dev_err(&client->dev,
"%s: write error, aborted\n", __func__);
return err;
}
break;
} }
} }

1046
drivers/staging/media/atomisp/i2c/ov2680.h
View File

File diff suppressed because it is too large Load Diff