]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: saa7146: make use of i2c_8bit_addr_from_msg
authorPeter Rosin <peda@axentia.se>
Wed, 9 Jan 2019 11:24:56 +0000 (06:24 -0500)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Wed, 16 Jan 2019 17:38:42 +0000 (12:38 -0500)
Because it looks neater.

Signed-off-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/common/saa7146/saa7146_i2c.c

index 3feddc52c446b38f54a01868b3ef587fb4fd2de2..df9ebe2a168cb05c24bc32123d108510f79cbad5 100644 (file)
@@ -54,10 +54,7 @@ static int saa7146_i2c_msg_prepare(const struct i2c_msg *m, int num, __le32 *op)
        /* loop through all messages */
        for(i = 0; i < num; i++) {
 
-               /* insert the address of the i2c-slave.
-                  note: we get 7 bit i2c-addresses,
-                  so we have to perform a translation */
-               addr = (m[i].addr*2) + ( (0 != (m[i].flags & I2C_M_RD)) ? 1 : 0);
+               addr = i2c_8bit_addr_from_msg(&m[i]);
                h1 = op_count/3; h2 = op_count%3;
                op[h1] |= cpu_to_le32(      (u8)addr << ((3-h2)*8));
                op[h1] |= cpu_to_le32(SAA7146_I2C_START << ((3-h2)*2));