Commit 2989a457 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

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: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent e40f1bcb

drivers/media/i2c/ccs/ccs-reg-access.c

+17 −20
Original line number Diff line number Diff line
@@ -168,18 +168,12 @@ static int __ccs_read_addr(struct ccs_sensor *sensor, u32 reg, u32 *val, 
	return 0;

}



int ccs_read_addr_no_quirk(struct ccs_sensor *sensor, u32 reg, u32 *val)

{

	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)

static int ccs_read_addr_raw(struct ccs_sensor *sensor, u32 reg, u32 *val,

			     bool force8, bool quirk)

{

	int rval;



	if (quirk) {

		*val = 0;

		rval = ccs_call_quirk(sensor, reg_access, false, &reg, val);

		if (rval == -ENOIOCTLCMD)
@@ -189,18 +183,21 @@ static int ccs_read_addr_quirk(struct ccs_sensor *sensor, u32 reg, u32 *val, 


		if (force8)

			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)

{

	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)

{

	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)