Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[media] smiapp: Remove unused quirk register functionality 



The quirk registers mechanism which allows register to have a static read
access value from the sensor specific quirks, is not used. Remove it. It is
to be replaced by a more generic register diversion quirk soon.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent ce9c2244

drivers/media/i2c/smiapp/smiapp-quirk.c

+0 −46
Original line number Original line Diff line number Diff line
@@ -61,52 +61,6 @@ void smiapp_replace_limit(struct smiapp_sensor *sensor, 
	sensor->limits[limit] = val;

	sensor->limits[limit] = val;

}

}





bool smiapp_quirk_reg(struct smiapp_sensor *sensor,

		      u32 reg, u32 *val)

{

	struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);

	const struct smia_reg *sreg;



	if (!sensor->minfo.quirk)

		return false;



	sreg = sensor->minfo.quirk->regs;



	if (!sreg)

		return false;



	while (sreg->type) {

		u16 type = reg >> 16;

		u16 reg16 = reg;



		if (sreg->type != type || sreg->reg != reg16) {

			sreg++;

			continue;

		}



		switch ((u8)type) {

		case SMIA_REG_8BIT:

			dev_dbg(&client->dev, "quirk: 0x%8.8x: 0x%2.2x\n",

				reg, sreg->val);

			break;

		case SMIA_REG_16BIT:

			dev_dbg(&client->dev, "quirk: 0x%8.8x: 0x%4.4x\n",

				reg, sreg->val);

			break;

		case SMIA_REG_32BIT:

			dev_dbg(&client->dev, "quirk: 0x%8.8x: 0x%8.8x\n",

				reg, sreg->val);

			break;

		}



		*val = sreg->val;



		return true;

	}



	return false;

}



static int jt8ew9_limits(struct smiapp_sensor *sensor)

static int jt8ew9_limits(struct smiapp_sensor *sensor)

{

{

	if (sensor->minfo.revision_number_major < 0x03)

	if (sensor->minfo.revision_number_major < 0x03)

drivers/media/i2c/smiapp/smiapp-quirk.h

+0 −10
Original line number Original line Diff line number Diff line
@@ -41,7 +41,6 @@ struct smiapp_quirk { 
	int (*post_poweron)(struct smiapp_sensor *sensor);

	int (*post_poweron)(struct smiapp_sensor *sensor);

	int (*pre_streamon)(struct smiapp_sensor *sensor);

	int (*pre_streamon)(struct smiapp_sensor *sensor);

	int (*post_streamoff)(struct smiapp_sensor *sensor);

	int (*post_streamoff)(struct smiapp_sensor *sensor);

	const struct smia_reg *regs;

	unsigned long flags;

	unsigned long flags;

};

};
@@ -56,15 +55,6 @@ struct smiapp_reg_8 { 




void smiapp_replace_limit(struct smiapp_sensor *sensor,

void smiapp_replace_limit(struct smiapp_sensor *sensor,

			  u32 limit, u32 val);

			  u32 limit, u32 val);

bool smiapp_quirk_reg(struct smiapp_sensor *sensor,

		      u32 reg, u32 *val);



#define SMIAPP_MK_QUIRK_REG(_reg, _val) \

	{				\

		.type = (_reg >> 16),	\

		.reg = (u16)_reg,	\

		.val = _val,		\

	}





#define smiapp_call_quirk(_sensor, _quirk, ...)				\

#define smiapp_call_quirk(_sensor, _quirk, ...)				\

	(_sensor->minfo.quirk &&					\

	(_sensor->minfo.quirk &&					\

drivers/media/i2c/smiapp/smiapp-regs.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -172,9 +172,6 @@ static int __smiapp_read(struct smiapp_sensor *sensor, u32 reg, u32 *val, 
	    && len != SMIA_REG_32BIT)

	    && len != SMIA_REG_32BIT)

		return -EINVAL;

		return -EINVAL;





	if (smiapp_quirk_reg(sensor, reg, val))

		goto found_quirk;



	if (len == SMIA_REG_8BIT && !only8)

	if (len == SMIA_REG_8BIT && !only8)

		rval = ____smiapp_read(sensor, (u16)reg, len, val);

		rval = ____smiapp_read(sensor, (u16)reg, len, val);

	else

	else
@@ -182,7 +179,6 @@ static int __smiapp_read(struct smiapp_sensor *sensor, u32 reg, u32 *val, 
	if (rval < 0)

	if (rval < 0)

		return rval;

		return rval;





found_quirk:

	if (reg & SMIA_REG_FLAG_FLOAT)

	if (reg & SMIA_REG_FLAG_FLOAT)

		*val = float_to_u32_mul_1000000(client, *val);

		*val = float_to_u32_mul_1000000(client, *val);

drivers/media/i2c/smiapp/smiapp-regs.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -34,11 +34,6 @@ 
#define SMIA_REG_8BIT			1

#define SMIA_REG_8BIT			1

#define SMIA_REG_16BIT			2

#define SMIA_REG_16BIT			2

#define SMIA_REG_32BIT			4

#define SMIA_REG_32BIT			4

struct smia_reg {

	u16 type;

	u16 reg;			/* 16-bit offset */

	u32 val;			/* 8/16/32-bit value */

};





struct smiapp_sensor;

struct smiapp_sensor;