Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / drivers / media / video / saa7134 / saa7134-i2c.c

diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index df9dd36721e0a633a56122c89f5471d8dda6599e..cce8da6a4f94dceb456b8893bb35a0ebbd2a905e 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -30,6 +30,7 @@
 
 #include "saa7134-reg.h"
 #include "saa7134.h"
+#include <media/v4l2-common.h>
 
 /* ----------------------------------------------------------- */
 
@@ -119,9 +120,9 @@ static inline int i2c_is_error(enum i2c_status status)
        case ARB_LOST:
        case SEQ_ERR:
        case ST_ERR:
-               return TRUE;
+               return true;
        default:
-               return FALSE;
+               return false;
        }
 }
 
@@ -130,9 +131,9 @@ static inline int i2c_is_idle(enum i2c_status status)
        switch (status) {
        case IDLE:
        case DONE_STOP:
-               return TRUE;
+               return true;
        default:
-               return FALSE;
+               return false;
        }
 }
 
@@ -140,9 +141,9 @@ static inline int i2c_is_busy(enum i2c_status status)
 {
        switch (status) {
        case BUSY:
-               return TRUE;
+               return true;
        default:
-               return FALSE;
+               return false;
        }
 }
 
@@ -158,8 +159,8 @@ static int i2c_is_busy_wait(struct saa7134_dev *dev)
                saa_wait(I2C_WAIT_DELAY);
        }
        if (I2C_WAIT_RETRY == count)
-               return FALSE;
-       return TRUE;
+               return false;
+       return true;
 }
 
 static int i2c_reset(struct saa7134_dev *dev)
@@ -170,7 +171,7 @@ static int i2c_reset(struct saa7134_dev *dev)
        d2printk(KERN_DEBUG "%s: i2c reset\n",dev->name);
        status = i2c_get_status(dev);
        if (!i2c_is_error(status))
-               return TRUE;
+               return true;
        i2c_set_status(dev,status);
 
        for (count = 0; count < I2C_WAIT_RETRY; count++) {
@@ -180,13 +181,13 @@ static int i2c_reset(struct saa7134_dev *dev)
                udelay(I2C_WAIT_DELAY);
        }
        if (I2C_WAIT_RETRY == count)
-               return FALSE;
+               return false;
 
        if (!i2c_is_idle(status))
-               return FALSE;
+               return false;
 
        i2c_set_attr(dev,NOP);
-       return TRUE;
+       return true;
 }
 
 static inline int i2c_send_byte(struct saa7134_dev *dev,
@@ -333,17 +334,18 @@ static int attach_inform(struct i2c_client *client)
        struct tuner_setup tun_setup;
 
        d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
-               client->driver->name, client->addr, client->name);
+               client->driver->driver.name, client->addr, client->name);
 
        /* Am I an i2c remote control? */
 
        switch (client->addr) {
                case 0x7a:
                case 0x47:
+               case 0x71:
                {
                        struct IR_i2c *ir = i2c_get_clientdata(client);
                        d1printk("%s i2c IR detected (%s).\n",
-                                client->driver->name,ir->phys);
+                                client->driver->driver.name, ir->phys);
                        saa7134_set_i2c_ir(dev,ir);
                        break;
                }
@@ -390,9 +392,7 @@ static struct i2c_algorithm saa7134_algo = {
 
 static struct i2c_adapter saa7134_adap_template = {
        .owner         = THIS_MODULE,
-#ifdef I2C_CLASS_TV_ANALOG
        .class         = I2C_CLASS_TV_ANALOG,
-#endif
        .name          = "saa7134",
        .id            = I2C_HW_SAA7134,
        .algo          = &saa7134_algo,