From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 15 Sep 2010 19:16:20 +0000 (-0300)
Subject: V4L/DVB: ir-kbd-i2c: remove obsolete I2C_HW_B_CX2341X test
X-Git-Tag: MMI-PSA29.97-13-9~21911^2~383
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a40231a67c443c5913366a45e9fc3da20a798790;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

V4L/DVB: ir-kbd-i2c: remove obsolete I2C_HW_B_CX2341X test

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 27ae8bbfb477..ece6e15e4c07 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -354,11 +354,9 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 	case 0x0b:
 	case 0x47:
 	case 0x71:
-		if (adap->id == I2C_HW_B_CX2388x ||
-		    adap->id == I2C_HW_B_CX2341X) {
+		if (adap->id == I2C_HW_B_CX2388x) {
 			/* Handled by cx88-input */
-			name = adap->id == I2C_HW_B_CX2341X ? "CX2341x remote"
-							    : "CX2388x remote";
+			name = "CX2388x remote";
 			ir_type     = IR_TYPE_RC5;
 			ir->get_key = get_key_haup_xvr;
 			if (hauppauge == 1) {