1 files changed, 0 insertions, 45 deletions

diff --git a/drivers/media/video/samsung/fimc/fimc_capture_u1.c b/drivers/media/video/samsung/fimc/fimc_capture_u1.c
index d21d877..1855abf 100644
--- a/drivers/media/video/samsung/fimc/fimc_capture_u1.c
+++ b/drivers/media/video/samsung/fimc/fimc_capture_u1.c
@@ -454,11 +454,7 @@ int fimc_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
 		return 0;
 
 	mutex_lock(&ctrl->v4l2_lock);
-#ifdef CONFIG_MACH_S2PLUS
-	if (ctrl->id == FIMC0)
-#else
 	if (ctrl->id != FIMC2)
-#endif
 		ret = subdev_call(ctrl, video, s_parm, a);
 	mutex_unlock(&ctrl->v4l2_lock);
 
@@ -654,11 +650,7 @@ int fimc_s_input(struct file *file, void *fh, unsigned int i)
 	if (!fimc->camera_isvalid[i])
 		return -EINVAL;
 
-#ifdef CONFIG_MACH_S2PLUS
-	if (fimc->camera[i]->sd && ctrl->id == FIMC0) {
-#else
 	if (fimc->camera[i]->sd && ctrl->id != FIMC2) {
-#endif
 		fimc_err("%s: Camera already in use.\n", __func__);
 		return -EBUSY;
 	}
@@ -685,18 +677,6 @@ int fimc_s_input(struct file *file, void *fh, unsigned int i)
 		printk(KERN_INFO "fimc_s_input activated subdev = %d\n", i);
 	}
 
-#ifdef CONFIG_MACH_S2PLUS
-	if (ctrl->id == FIMC1) {
-		if (i == fimc->active_camera) {
-			ctrl->cam = fimc->camera[i];
-			fimc_info2("fimc_s_input activating subdev FIMC1 %d\n",
-							ctrl->cam->initialized);
-		} else {
-			mutex_unlock(&ctrl->v4l2_lock);
-			return -EINVAL;
-		}
-	}
-#else
 	if (ctrl->id == FIMC2) {
 		if (i == fimc->active_camera) {
 			ctrl->cam = fimc->camera[i];
@@ -707,7 +687,6 @@ int fimc_s_input(struct file *file, void *fh, unsigned int i)
 			return -EINVAL;
 		}
 	}
-#endif
 
 	/*
 	 * The first time alloc for struct cap_info, and will be
@@ -973,11 +952,7 @@ int fimc_s_fmt_vid_capture(struct file *file, void *fh, struct v4l2_format *f)
 	memcpy(&cap->fmt, &f->fmt.pix, sizeof(cap->fmt));
 
 	mbus_fmt = &cap->mbus_fmt;
-#ifdef CONFIG_MACH_S2PLUS
-	if (ctrl->id == FIMC0) {
-#else
 	if (ctrl->id != FIMC2) {
-#endif
 		if (cap->movie_mode || cap->vt_mode ||
 		    cap->fmt.priv == V4L2_PIX_FMT_MODE_HDR) {
 #if defined(CONFIG_MACH_PX) && defined(CONFIG_VIDEO_HD_SUPPORT)
@@ -1053,11 +1028,7 @@ int fimc_s_fmt_vid_capture(struct file *file, void *fh, struct v4l2_format *f)
 		return 0;
 	}
 
-#ifdef CONFIG_MACH_S2PLUS
-	if (ctrl->id == FIMC0)
-#else
 	if (ctrl->id != FIMC2)
-#endif
 		ret = subdev_call(ctrl, video, s_mbus_fmt, mbus_fmt);
 
 	mutex_unlock(&ctrl->v4l2_lock);
@@ -1637,11 +1608,7 @@ int fimc_s_ctrl_capture(void *fh, struct v4l2_control *c)
 		if ((ctrl->cam->id == CAMERA_WB) || \
 			 (ctrl->cam->id == CAMERA_WB_B))
 			break;
-#ifdef CONFIG_MACH_S2PLUS
-		if (FIMC0 == ctrl->id)
-#else
 		if (FIMC2 != ctrl->id)
-#endif
 			ret = subdev_call(ctrl, core, s_ctrl, c);
 		else
 			ret = 0;
@@ -1844,11 +1811,7 @@ int fimc_streamon_capture(void *fh)
 		cam = ctrl->cam;
 
 	if ((ctrl->cam->id != CAMERA_WB) && (ctrl->cam->id != CAMERA_WB_B)) {
-#ifdef CONFIG_MACH_S2PLUS
-		if (ctrl->id == FIMC0) {
-#else
 		if (ctrl->id != FIMC2) {
-#endif
 			ret = subdev_call(ctrl, video, enum_framesizes, &cam_frmsize);
 			if (ret < 0) {
 				dev_err(ctrl->dev, "%s: enum_framesizes failed\n", __func__);
@@ -2067,11 +2030,7 @@ int fimc_streamoff_capture(void *fh)
 
 #if defined(CONFIG_MACH_PX)
 #ifdef CONFIG_VIDEO_IMPROVE_STREAMOFF
-#ifdef CONFIG_MACH_S2PLUS
-	if ((ctrl->id == FIMC0) && (ctrl->cam->type == CAM_TYPE_MIPI))
-#else
 	if ((ctrl->id != FIMC2) && (ctrl->cam->type == CAM_TYPE_MIPI))
-#endif
 		v4l2_subdev_call(ctrl->cam->sd, video, s_stream,
 			STREAM_MODE_CAM_OFF);
 #endif /* CONFIG_VIDEO_IMPROVE_STREAMOFF */
@@ -2090,11 +2049,7 @@ int fimc_streamoff_capture(void *fh)
 		INIT_LIST_HEAD(&cap->inq);
 
 	ctrl->status = FIMC_STREAMOFF;
-#ifdef CONFIG_MACH_S2PLUS
-	if (ctrl->id == FIMC0) {
-#else
 	if (ctrl->id != FIMC2) {
-#endif
 		if (ctrl->cam->type == CAM_TYPE_MIPI) {
 			if (ctrl->cam->id == CAMERA_CSI_C)
 				s3c_csis_stop(CSI_CH_0);