---

yaml
---
r: 219253
b: refs/heads/master
c: e3e0aaa
h: refs/heads/master
i:
  219251: 54e7ba2
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99d35a0e4c5f90fedd08b378be880308e3ef8cb3
+refs/heads/master: e3e0aaaafae24658f3d8683c65bc6793adbdfeb8

trunk/drivers/media/video/cx231xx/cx231xx-cards.c

@@ -584,43 +584,18 @@ void cx231xx_card_setup(struct cx231xx *dev)
 
 	}
 
-	switch (dev->model) {
-	case CX231XX_BOARD_CNXT_CARRAERA:
-	case CX231XX_BOARD_CNXT_RDE_250:
-	case CX231XX_BOARD_CNXT_SHELBY:
-	case CX231XX_BOARD_CNXT_RDU_250:
-		if (dev->board.tuner_type != TUNER_ABSENT) {
-			dev->sd_tuner =	v4l2_i2c_new_subdev(&dev->v4l2_dev,
-					&dev->i2c_bus[1].i2c_adap,
-					"tuner", "tuner", 0xc2 >> 1, NULL);
-			if (dev->sd_tuner == NULL)
-				cx231xx_info(
-				"tuner subdev registration failure\n");
-
-			cx231xx_config_tuner(dev);
-		}
-		break;
-	case CX231XX_BOARD_CNXT_RDE_253S:
-	case CX231XX_BOARD_CNXT_RDU_253S:
-	case CX231XX_BOARD_CNXT_VIDEO_GRABBER:
-	case CX231XX_BOARD_HAUPPAUGE_EXETER:
-		if (dev->board.tuner_type != TUNER_ABSENT) {
-			dev->sd_tuner =	v4l2_i2c_new_subdev(&dev->v4l2_dev,
-					&dev->i2c_bus[1].i2c_adap,
-					"tuner", "tuner", 0xc0 >> 1, NULL);
-			if (dev->sd_tuner == NULL)
-				cx231xx_info(
-				"tuner subdev registration failure\n");
-
+	/* Initialize the tuner */
+	if (dev->board.tuner_type != TUNER_ABSENT) {
+		dev->sd_tuner = v4l2_i2c_new_subdev(&dev->v4l2_dev,
+						    &dev->i2c_bus[1].i2c_adap,
+						    "tuner", "tuner",
+						    dev->tuner_addr, NULL);
+		if (dev->sd_tuner == NULL)
+			cx231xx_info("tuner subdev registration failure\n");
+		else
 			cx231xx_config_tuner(dev);
-		}
-		break;
-	default:
-		break;
 	}
 
-	cx231xx_config_tuner(dev);
-
 #if 0
 	/* TBD  IR will be added later */
 	cx231xx_ir_init(dev);