From: Tomas Winkler <tomas.winkler@intel.com>
Date: Wed, 2 Mar 2011 22:10:50 +0000 (+0200)
Subject: staging/easycap: replace if(false == var) with if (!var)
X-Git-Tag: v2.6.39-rc1~469^2~277
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=febd32bcfd09aeb543b229fd2896814a26d74d20;p=karo-tx-linux.git

staging/easycap: replace if(false == var) with if (!var)

    's/(false == \([^ ]\+\))/(!\1)/g'

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c
index 7f59b948ded9..5c092503f39b 100644
--- a/drivers/staging/easycap/easycap_main.c
+++ b/drivers/staging/easycap/easycap_main.c
@@ -1385,7 +1385,7 @@ field2frame(struct easycap *peasycap)
 	pad = peasycap->frame_buffer[kad][0].pgo;  rad = PAGE_SIZE;
 	odd = !!(peasycap->field_buffer[kex][0].kount);
 
-	if (odd && (false == decimatepixel)) {
+	if (odd && (!decimatepixel)) {
 		JOM(8, "initial skipping %4i bytes p.%4i\n",
 					w3/multiplier, mad);
 		pad += (w3 / multiplier); rad -= (w3 / multiplier);
@@ -1400,7 +1400,7 @@ field2frame(struct easycap *peasycap)
 		 *  READ   w2   BYTES FROM FIELD BUFFER,
 		 *  WRITE  w3   BYTES TO FRAME BUFFER
 		 */
-		if (false == decimatepixel) {
+		if (!decimatepixel) {
 			over = w2;
 			do {
 				much = over;  more = 0;
@@ -1489,7 +1489,7 @@ field2frame(struct easycap *peasycap)
  *  UNLESS IT IS THE LAST LINE OF AN ODD FRAME
  */
 /*---------------------------------------------------------------------------*/
-			if ((false == odd) || (cz != wz)) {
+			if (!odd || (cz != wz)) {
 				over = w3;
 				do {
 					if (!rad) {
@@ -1514,7 +1514,7 @@ field2frame(struct easycap *peasycap)
  *  WRITE  w3 / 2  BYTES TO FRAME BUFFER
  */
 /*---------------------------------------------------------------------------*/
-		} else if (false == odd) {
+		} else if (!odd) {
 			over = w2;
 			do {
 				much = over;  more = 0;  margin = 0;  mask = 0x00;
@@ -1641,12 +1641,12 @@ field2frame(struct easycap *peasycap)
 		SAM("ERROR: discrepancy %i in bytes read\n", c2 - cz);
 	c3 = (mad + 1)*PAGE_SIZE - rad;
 
-	if (false == decimatepixel) {
+	if (!decimatepixel) {
 		if (bytesperpixel * cz != c3)
 			SAM("ERROR: discrepancy %i in bytes written\n",
 					c3 - (bytesperpixel * cz));
 	} else {
-		if (false == odd) {
+		if (!odd) {
 			if (bytesperpixel *
 				cz != (4 * c3))
 				SAM("ERROR: discrepancy %i in bytes written\n",
@@ -1830,9 +1830,9 @@ redaub(struct easycap *peasycap, void *pad, void *pex, int much, int more,
 /*---------------------------------------------------------------------------*/
 	switch (bytesperpixel) {
 	case 2: {
-		if (false == decimatepixel) {
+		if (!decimatepixel) {
 			memcpy(pad, pex, (size_t)much);
-			if (false == byteswaporder) {
+			if (!byteswaporder) {
 				/* UYVY */
 				return 0;
 			} else {
@@ -1847,7 +1847,7 @@ redaub(struct easycap *peasycap, void *pad, void *pex, int much, int more,
 				return 0;
 			}
 		} else {
-			if (false == byteswaporder) {
+			if (!byteswaporder) {
 				/*  UYVY DECIMATED */
 				p2 = (u8 *)pex;  p3 = (u8 *)pad;  pz = p2 + much;
 				while (pz > p2) {
@@ -1875,8 +1875,8 @@ redaub(struct easycap *peasycap, void *pad, void *pex, int much, int more,
 		}
 	case 3:
 		{
-		if (false == decimatepixel) {
-			if (false == byteswaporder) {
+		if (!decimatepixel) {
+			if (!byteswaporder) {
 				/* RGB */
 				while (pz > p2) {
 					if (pr <= (p3 + bytesperpixel))
@@ -2015,7 +2015,7 @@ redaub(struct easycap *peasycap, void *pad, void *pex, int much, int more,
 				}
 			return 0;
 		} else {
-			if (false == byteswaporder) {
+			if (!byteswaporder) {
 				/*  RGB DECIMATED */
 				while (pz > p2) {
 					if (pr <= (p3 + bytesperpixel))
@@ -2164,8 +2164,8 @@ redaub(struct easycap *peasycap, void *pad, void *pex, int much, int more,
 		}
 	case 4:
 		{
-		if (false == decimatepixel) {
-			if (false == byteswaporder) {
+		if (!decimatepixel) {
+			if (!byteswaporder) {
 				/* RGBA */
 				while (pz > p2) {
 					if (pr <= (p3 + bytesperpixel))
@@ -2324,7 +2324,7 @@ redaub(struct easycap *peasycap, void *pad, void *pex, int much, int more,
 			}
 			return 0;
 		} else {
-			if (false == byteswaporder) {
+			if (!byteswaporder) {
 				/*
 				 *  RGBA DECIMATED
 				 */
diff --git a/drivers/staging/easycap/easycap_sound.c b/drivers/staging/easycap/easycap_sound.c
index 8fc2f16387df..d0ef7af8151e 100644
--- a/drivers/staging/easycap/easycap_sound.c
+++ b/drivers/staging/easycap/easycap_sound.c
@@ -177,7 +177,7 @@ easycap_alsa_complete(struct urb *purb)
 						peasycap->dma_next = fragment_bytes;
 						JOM(8, "wrapped dma buffer\n");
 					}
-					if (false == peasycap->microphone) {
+					if (!peasycap->microphone) {
 						if (much > more)
 							much = more;
 						memcpy(prt->dma_area +
diff --git a/drivers/staging/easycap/easycap_sound_oss.c b/drivers/staging/easycap/easycap_sound_oss.c
index 71776fc0dc3c..3e033edc8ede 100644
--- a/drivers/staging/easycap/easycap_sound_oss.c
+++ b/drivers/staging/easycap/easycap_sound_oss.c
@@ -178,7 +178,7 @@ easyoss_complete(struct urb *purb)
 
 					much = PAGE_SIZE - (int)(paudio_buffer->pto - paudio_buffer->pgo);
 
-					if (false == peasycap->microphone) {
+					if (!peasycap->microphone) {
 						if (much > more)
 							much = more;