openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: ccs: Refactor register reading a little 

Rework quirk and 8-bit only access functions with a single function that
takes arguments. This is later extensible to support yet more flags.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Sakari Ailus 2020-09-02 12:09:03 +02:00 committed by Mauro Carvalho Chehab
parent e40f1bcbee
commit 2989a45717
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/media/i2c/ccs/ccs-reg-access.c
View File

@ -168,39 +168,36 @@ static int __ccs_read_addr(struct ccs_sensor *sensor, u32 reg, u32 *val,
return 0; return 0;
} }
int ccs_read_addr_no_quirk(struct ccs_sensor *sensor, u32 reg, u32 *val) static int ccs_read_addr_raw(struct ccs_sensor *sensor, u32 reg, u32 *val,
{ bool force8, bool quirk)
return __ccs_read_addr(
sensor, reg, val,
ccs_needs_quirk(sensor, CCS_QUIRK_FLAG_8BIT_READ_ONLY));
}
static int ccs_read_addr_quirk(struct ccs_sensor *sensor, u32 reg, u32 *val,
bool force8)
{ {
int rval; int rval;
*val = 0; if (quirk) {
rval = ccs_call_quirk(sensor, reg_access, false, &reg, val); *val = 0;
if (rval == -ENOIOCTLCMD) rval = ccs_call_quirk(sensor, reg_access, false, &reg, val);
return 0; if (rval == -ENOIOCTLCMD)
if (rval < 0) return 0;
return rval; if (rval < 0)
return rval;
if (force8) if (force8)
return __ccs_read_addr(sensor, reg, val, true); return __ccs_read_addr(sensor, reg, val, true);
}
return ccs_read_addr_no_quirk(sensor, reg, val); return __ccs_read_addr(sensor, reg, val,
ccs_needs_quirk(sensor,
CCS_QUIRK_FLAG_8BIT_READ_ONLY));
} }
int ccs_read_addr(struct ccs_sensor *sensor, u32 reg, u32 *val) int ccs_read_addr(struct ccs_sensor *sensor, u32 reg, u32 *val)
{ {
return ccs_read_addr_quirk(sensor, reg, val, false); return ccs_read_addr_raw(sensor, reg, val, false, true);
} }
int ccs_read_addr_8only(struct ccs_sensor *sensor, u32 reg, u32 *val) int ccs_read_addr_8only(struct ccs_sensor *sensor, u32 reg, u32 *val)
{ {
return ccs_read_addr_quirk(sensor, reg, val, true); return ccs_read_addr_raw(sensor, reg, val, true, true);
} }
int ccs_write_addr_no_quirk(struct ccs_sensor *sensor, u32 reg, u32 val) int ccs_write_addr_no_quirk(struct ccs_sensor *sensor, u32 reg, u32 val)