evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] smiapp: Remove unused quirk register functionality

Browse source 
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: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Sakari Ailus 2014-04-12 14:32:01 -03:00 • committed by Mauro Carvalho Chehab
parent ce9c22443e
commit d4f79a80e6
4 changed files with 0 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
drivers/media/i2c/smiapp/smiapp-quirk.c
View file

@ -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)

10
drivers/media/i2c/smiapp/smiapp-quirk.h
View file

@ -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 && \

4
drivers/media/i2c/smiapp/smiapp-regs.c
View file

@ -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);

5
drivers/media/i2c/smiapp/smiapp-regs.h
View file

@ -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;