From: Michael Krufky <mkrufky@linuxtv.org>
Date: Mon, 25 Jun 2007 17:54:09 +0000 (-0300)
Subject: V4L/DVB (5788): Cx88-input: convert nested if's to switch..case
X-Git-Tag: v2.6.23-rc1~493^2~41
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=829ea96477e775df0698b54dbfa913b6b55a4d6d;p=linux-2.6

V4L/DVB (5788): Cx88-input: convert nested if's to switch..case

In the function, cx88_ir_handle_key:
- convert nested if statement to a switch..case block

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 22cbdf2f0f..f5d4a56534 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -74,7 +74,8 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
 
 	/* read gpio value */
 	gpio = cx_read(ir->gpio_addr);
-	if (core->board == CX88_BOARD_NPGTECH_REALTV_TOP10FM) {
+	switch (core->board) {
+	case CX88_BOARD_NPGTECH_REALTV_TOP10FM:
 		/* This board apparently uses a combination of 2 GPIO
 		   to represent the keys. Additionally, the second GPIO
 		   can be used for parity.
@@ -90,12 +91,14 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
 		auxgpio = cx_read(MO_GP1_IO);
 		/* Take out the parity part */
 		gpio=(gpio & 0x7fd) + (auxgpio & 0xef);
-	} else if (core->board == CX88_BOARD_WINFAST_DTV1000) {
+		break;
+	case CX88_BOARD_WINFAST_DTV1000:
 		gpio = (gpio & 0x6ff) | ((cx_read(MO_GP1_IO) << 8) & 0x900);
 		auxgpio = gpio;
-	} else
+		break;
+	default:
 		auxgpio = gpio;
-
+	}
 	if (ir->polling) {
 		if (ir->last_gpio == auxgpio)
 			return;