[media] usbvision: Drop broken 10-bit I2C address support

The support for 10-bit I2C addresses in usbvision seems plain broken
to me. I had already noticed that back in February 2007 [1]. The code
was not fixed since then, so I take it that it's not actually needed.
And as a matter of fact I don't know of any 10-bit addressed I2C
tuner, encode, decoder or the like.

So let's simply get rid of the broken and useless code.

I'm also adding I2C_FUNC_I2C, as the driver and hardware support plain
I2C messaging.

[1] http://marc.info/?l=linux-i2c&m=117499415208244&w=2

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index d7f97513b2894c61902ed9783898997acae0893a..89fec029e9246c6933b7cfa6aea9441fc403536b 100644 (file)
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -110,42 +110,20 @@ static inline int usb_find_address(struct i2c_adapter *i2c_adap,
 
        unsigned char addr;
        int ret;
-       if ((flags & I2C_M_TEN)) {
-               /* a ten bit address */
-               addr = 0xf0 | ((msg->addr >> 7) & 0x03);
-               /* try extended address code... */
-               ret = try_write_address(i2c_adap, addr, retries);
-               if (ret != 1) {
-                       dev_err(&i2c_adap->dev,
-                               "died at extended address code, while writing\n");
-                       return -EREMOTEIO;
-               }
-               add[0] = addr;
-               if (flags & I2C_M_RD) {
-                       /* okay, now switch into reading mode */
-                       addr |= 0x01;
-                       ret = try_read_address(i2c_adap, addr, retries);
-                       if (ret != 1) {
-                               dev_err(&i2c_adap->dev,
-                                       "died at extended address code, while reading\n");
-                               return -EREMOTEIO;
-                       }
-               }
 
-       } else {                /* normal 7bit address  */
-               addr = (msg->addr << 1);
-               if (flags & I2C_M_RD)
-                       addr |= 1;
+       addr = (msg->addr << 1);
+       if (flags & I2C_M_RD)
+               addr |= 1;
 
-               add[0] = addr;
-               if (flags & I2C_M_RD)
-                       ret = try_read_address(i2c_adap, addr, retries);
-               else
-                       ret = try_write_address(i2c_adap, addr, retries);
+       add[0] = addr;
+       if (flags & I2C_M_RD)
+               ret = try_read_address(i2c_adap, addr, retries);
+       else
+               ret = try_write_address(i2c_adap, addr, retries);
+
+       if (ret != 1)
+               return -EREMOTEIO;
 
-               if (ret != 1)
-                       return -EREMOTEIO;
-       }
        return 0;
 }
 
@@ -184,7 +162,7 @@ usbvision_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
 
 static u32 functionality(struct i2c_adapter *adap)
 {
-       return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR;
+       return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
 }
 
 /* -----exported algorithm data: ------------------------------------- */