2 files changed, 12 insertions, 18 deletions

diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 6f9fe86fed98..cce8da6a4f94 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -120,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;
         }
 }
 
@@ -131,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;
         }
 }
 
@@ -141,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;
         }
 }
 
@@ -159,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)
@@ -171,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++) {
@@ -181,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,
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 2ad859bda2e3..b3e3957c89b5 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -45,12 +45,6 @@
 #include <media/video-buf-dvb.h>
 #endif
 
-#ifndef TRUE
-# define TRUE (1==1)
-#endif
-#ifndef FALSE
-# define FALSE (1==0)
-#endif
 #define UNSET (-1U)
 
 /* ----------------------------------------------------------- */