drivers/media/video: Convert to generic boolean-values
PATCH 1/1 drivers/media/video: Convert to generic boolean-values
Signed-off-by Richard Knutsson <[email protected]>
---
Compile-tested with "allyes", "allmod" & "allno" on i386.
saa5246a.c | 10 +++++----- saa5246a.h | 9 ++------- saa5249.c | 41 ++++++++++++++++++----------------------- saa7134/saa7134-i2c.c | 24 ++++++++++++------------ saa7134/saa7134.h | 6 ------ 5 files changed, 37 insertions(+), 53 deletions(-)
drivers/media/video/saa5246a.c +5 -5
@@ -112,7 +112,7 @@ static int saa5246a_attach(struct i2c_adapter *adap, int addr, int kind)for (pgbuf =0 ; pgbuf <NUM_DAUS ; pgbuf++) {memset (t->pgbuf[pgbuf],' ' ,sizeof (t->pgbuf[0 ])); - t->is_searching[pgbuf] = FALSE; + t->is_searching[pgbuf] = false; } vd->priv=t;
@@ -199,7 +199,7 @@ static int i2c_senddata(struct saa5246a_device *t, ...)/* Get count number of bytes from I�C-device at address adr, store them in buf. * Start & stop handshaking is done by this routine, ack will be sent after the -* last byte to inhibit further sending of data. If uaccess is TRUE, data is +* last byte to inhibit further sending of data. If uaccess is 'true', data is * written to user-space with put_user. Returns -1 if I�C-device didn't send * acknowledge, 0 otherwise */
@@ -339,7 +339,7 @@ static int saa5246a_request_page(struct saa5246a_device *t,return -EIO ; } - t->is_searching[req->pgbuf] = TRUE; + t->is_searching[req->pgbuf] = true;return 0 ; }
@@ -453,7 +453,7 @@ static inline int saa5246a_get_status(struct saa5246a_device *t, } }if (!info->hamming && !info->notfound) - t->is_searching[dau_no] = FALSE; + t->is_searching[dau_no] = false;return 0 ; }
@@ -565,7 +565,7 @@ static inline int saa5246a_stop_dau(struct saa5246a_device *t, {return -EIO ; } - t->is_searching[dau_no] = FALSE; + t->is_searching[dau_no] = false;return 0 ; }
drivers/media/video/saa5246a.h +2 -7
@@ -41,23 +41,18 @@#define POS_HEADER_START 7#define POS_HEADER_END 31 -/* Returns TRUE if the part of the videotext page described with req contains +/* Returns 'true' if the part of the videotext page described with req contains (at least parts of) the time field */ #define REQ_CONTAINS_TIME (p_req) \ ((p_req)->start <= POS_TIME_END && \ (p_req)->end >= POS_TIME_START) -/* Returns TRUE if the part of the videotext page described with req contains +/* Returns 'true' if the part of the videotext page described with req contains (at least parts of) the page header */ #define REQ_CONTAINS_HEADER (p_req) \ ((p_req)->start <= POS_HEADER_END && \ (p_req)->end >= POS_HEADER_START) -#ifndef FALSE -#define FALSE 0 -#define TRUE 1 -#endif -/*****************************************************************************/ /* Mode register numbers of the SAA5246A */ /*****************************************************************************/
drivers/media/video/saa5249.c +18 -23
108 lines not on this page · raw message
drivers/media/video/saa7134/saa7134-i2c.c +12 -12
@@ -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,
drivers/media/video/saa7134/saa7134.h +0 -6
@@ -43,12 +43,6 @@#include <sound/pcm.h> #include <media/video-buf-dvb.h> -#ifndef TRUE -# define TRUE (1==1) -#endif -#ifndef FALSE -# define FALSE (1==0) -#endif #define UNSET (-1U)/* ----------------------------------------------------------- */