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>

diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index 00b5c7e91d5d8189ca212f297fbd0fccf908ae29..c799fdf26272f94eaac8d74ef8d65224d94547a3 100644 (file)
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -92,33 +92,36 @@ static int cx22702_writereg(struct cx22702_state *state, u8 reg, u8 data)
 
        ret = i2c_transfer(state->i2c, &msg, 1);
 
-       if (ret != 1)
+       if (unlikely(ret != 1)) {
                printk(KERN_ERR
                        "%s: error (reg == 0x%02x, val == 0x%02x, ret == %i)\n",
                        __func__, reg, data, ret);
+               return -1;
+       }
 
-       return (ret != 1) ? -1 : 0;
+       return 0;
 }
 
 static u8 cx22702_readreg(struct cx22702_state *state, u8 reg)
 {
        int ret;
-       u8 b0[] = { reg };
-       u8 b1[] = { 0 };
+       u8 data;
 
        struct i2c_msg msg[] = {
                { .addr = state->config->demod_address, .flags = 0,
-                       .buf = b0, .len = 1 },
+                       .buf = &reg, .len = 1 },
                { .addr = state->config->demod_address, .flags = I2C_M_RD,
-                       .buf = b1, .len = 1 } };
+                       .buf = &data, .len = 1 } };
 
        ret = i2c_transfer(state->i2c, msg, 2);
 
-       if (ret != 2)
-               printk(KERN_ERR "%s: readreg error (ret == %i)\n",
-                       __func__, ret);
+       if (unlikely(ret != 2)) {
+               printk(KERN_ERR "%s: error (reg == 0x%02x, ret == %i)\n",
+                       __func__, reg, ret);
+               return 0;
+       }
 
-       return b1[0];
+       return data;
 }
 
 static int cx22702_set_inversion(struct cx22702_state *state, int inversion)