aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorsbrissen <sbrissen@hotmail.com>2013-12-16 13:18:35 -0500
committersbrissen <sbrissen@hotmail.com>2013-12-16 13:18:35 -0500
commitfab9e4c915e35338d589b04b3b9c2a9ce283e960 (patch)
tree36691bb63ed35ce6cc79439aaab543396dced148 /drivers
parent4f36692d101e6ec3243a2c1529fd8792a191f229 (diff)
downloadkernel_samsung_smdk4412-fab9e4c915e35338d589b04b3b9c2a9ce283e960.zip
kernel_samsung_smdk4412-fab9e4c915e35338d589b04b3b9c2a9ce283e960.tar.gz
kernel_samsung_smdk4412-fab9e4c915e35338d589b04b3b9c2a9ce283e960.tar.bz2
smdk4412: remove some logging I added
Change-Id: I264ee04c7c6726e68cdd186f22ab45dc8bf5be0f
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/samsung/fimc/fimc_capture.c6
-rw-r--r--drivers/mmc/card/block.c1
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/video/samsung/fimc/fimc_capture.c b/drivers/media/video/samsung/fimc/fimc_capture.c
index 75928ed..e438205 100644
--- a/drivers/media/video/samsung/fimc/fimc_capture.c
+++ b/drivers/media/video/samsung/fimc/fimc_capture.c
@@ -1927,7 +1927,6 @@ int fimc_reqbufs_capture_mmap(void *fh, struct v4l2_requestbuffers *b)
case V4L2_PIX_FMT_YVYU: /* fall through */
case V4L2_PIX_FMT_NV16: /* fall through */
case V4L2_PIX_FMT_NV61: /* fall through */
- fimc_err("%s : V4L2_PIX_FMT_YUYV - SBRISSEN\n", __func__);
fimc_err("%s : w %d h %d \n",__func__,
cap->fmt.width, cap->fmt.height);
fimc_info1("%s : 1plane\n", __func__);
@@ -1936,7 +1935,6 @@ int fimc_reqbufs_capture_mmap(void *fh, struct v4l2_requestbuffers *b)
break;
case V4L2_PIX_FMT_NV21:
- fimc_err("%s : V4L2_PIX_FMT_NV12 - SBRISSEN\n", __func__);
fimc_info1("%s : 2plane for NV21 w %d h %d\n", __func__,
cap->fmt.width, cap->fmt.height);
ret = fimc_alloc_buffers(ctrl, 2,
@@ -1966,21 +1964,18 @@ int fimc_reqbufs_capture_mmap(void *fh, struct v4l2_requestbuffers *b)
break;
case V4L2_PIX_FMT_JPEG:
- fimc_err("%s : V4L2_PIX_FMT_JPEG - SBRISSEN\n", __func__);
fimc_info1("%s : JPEG 1plane\n", __func__);
size = fimc_camera_get_jpeg_memsize(ctrl);
fimc_info2("%s : JPEG 1plane size = %x\n", __func__, size);
ret = fimc_alloc_buffers(ctrl, 1, size, 0, 8, cap->pktdata_enable, cap->pktdata_size);
break;
case V4L2_PIX_FMT_INTERLEAVED:
- fimc_err("%s : V4L2_PIX_FMT_INTERLEAVED - SBRISSEN\n", __func__);
fimc_info1("%s : Interleaved Format\n", __func__);
size = fimc_camera_get_jpeg_memsize(ctrl); /*0xA00000*/
fimc_info2("%s : Interleaved size = %x\n", __func__, size);
ret = fimc_alloc_buffers(ctrl, 1, size, 0, 8, cap->pktdata_enable, cap->pktdata_size);
break;
default:
- fimc_err("%s : default - SBRISSEN\n", __func__);
break;
}
@@ -1990,7 +1985,6 @@ int fimc_reqbufs_capture_mmap(void *fh, struct v4l2_requestbuffers *b)
return -ENOMEM;
}
- fimc_err("%s : SBRISSEN - done\n", __func__);
mutex_unlock(&ctrl->v4l2_lock);
return 0;
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 1c63296..2d55947 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -2020,7 +2020,6 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc)
mq_rq->packed_num -= idx;
#ifdef CONFIG_WIMAX_CMC
if (mq_rq->packed_num == 1) {
- printk(KERN_ERR "SBRISSEN - I AM HERE\n");
mq_rq->packed_cmd = MMC_PACKED_NONE;
mq_rq->packed_num = 0;
}