From: Jean Delvare <khali@linux-fr.org>
Date: Tue, 22 Apr 2008 17:45:47 +0000 (-0300)
Subject: V4L/DVB (7332): ir-kbd-i2c: Minor optimization in ir_probe
X-Git-Tag: v2.6.26-rc1~1084^2~337
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d6f34d7adddb144c3b450e15df3749f0e0a651c6;p=~shefty%2Frdma-dev.git

V4L/DVB (7332): ir-kbd-i2c: Minor optimization in ir_probe

This saves an initialization and a comparison.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 58a1ddddb09..7942bd07851 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -508,7 +508,7 @@ static int ir_probe(struct i2c_adapter *adap)
 	static const int probe_em28XX[] = { 0x30, 0x47, -1 };
 	static const int probe_cx88[] = { 0x18, 0x6b, 0x71, -1 };
 	static const int probe_cx23885[] = { 0x6b, -1 };
-	const int *probe = NULL;
+	const int *probe;
 	struct i2c_client *c;
 	unsigned char buf;
 	int i, rc;
@@ -532,9 +532,9 @@ static int ir_probe(struct i2c_adapter *adap)
 	case I2C_HW_B_CX23885:
 		probe = probe_cx23885;
 		break;
-	}
-	if (NULL == probe)
+	default:
 		return 0;
+	}
 
 	c = kzalloc(sizeof(*c), GFP_KERNEL);
 	if (!c)