V4L/DVB: cx22702: Clean up register access functions
* Avoid temporary variables. * Optimize success paths. * Make error messages consistently verbose. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
a0a4714c40
commit
24764107ec
|
@ -92,33 +92,36 @@ static int cx22702_writereg(struct cx22702_state *state, u8 reg, u8 data)
|
||||||
|
|
||||||
ret = i2c_transfer(state->i2c, &msg, 1);
|
ret = i2c_transfer(state->i2c, &msg, 1);
|
||||||
|
|
||||||
if (ret != 1)
|
if (unlikely(ret != 1)) {
|
||||||
printk(KERN_ERR
|
printk(KERN_ERR
|
||||||
"%s: error (reg == 0x%02x, val == 0x%02x, ret == %i)\n",
|
"%s: error (reg == 0x%02x, val == 0x%02x, ret == %i)\n",
|
||||||
__func__, reg, data, ret);
|
__func__, reg, data, ret);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
return (ret != 1) ? -1 : 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static u8 cx22702_readreg(struct cx22702_state *state, u8 reg)
|
static u8 cx22702_readreg(struct cx22702_state *state, u8 reg)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
u8 b0[] = { reg };
|
u8 data;
|
||||||
u8 b1[] = { 0 };
|
|
||||||
|
|
||||||
struct i2c_msg msg[] = {
|
struct i2c_msg msg[] = {
|
||||||
{ .addr = state->config->demod_address, .flags = 0,
|
{ .addr = state->config->demod_address, .flags = 0,
|
||||||
.buf = b0, .len = 1 },
|
.buf = ®, .len = 1 },
|
||||||
{ .addr = state->config->demod_address, .flags = I2C_M_RD,
|
{ .addr = state->config->demod_address, .flags = I2C_M_RD,
|
||||||
.buf = b1, .len = 1 } };
|
.buf = &data, .len = 1 } };
|
||||||
|
|
||||||
ret = i2c_transfer(state->i2c, msg, 2);
|
ret = i2c_transfer(state->i2c, msg, 2);
|
||||||
|
|
||||||
if (ret != 2)
|
if (unlikely(ret != 2)) {
|
||||||
printk(KERN_ERR "%s: readreg error (ret == %i)\n",
|
printk(KERN_ERR "%s: error (reg == 0x%02x, ret == %i)\n",
|
||||||
__func__, ret);
|
__func__, reg, ret);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
return b1[0];
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cx22702_set_inversion(struct cx22702_state *state, int inversion)
|
static int cx22702_set_inversion(struct cx22702_state *state, int inversion)
|
||||||
|
|
Loading…
Reference in New Issue