summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@linaro.org>2015-04-22 13:08:17 +0300
committerLaurent Pinchart <laurent.pinchart@linaro.org>2015-04-28 21:02:49 +0300
commitd02257eb40123c28ab71fa8ee069169355d9401a (patch)
treea84b0e84c4d1d808f5b069c17a9409c0c38696c0
parentcbfc75662981e0211eea8b7638451b5f2adcbccb (diff)
media: mv-sc2: Remove 'TBD' commented-out code
git is a good revision control system, no need to keep commented-out code in the source. Signed-off-by: Laurent Pinchart <laurent.pinchart@linaro.org> Acked-By: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
-rw-r--r--drivers/media/platform/soc_camera/mv_sc2_camera.c35
1 files changed, 0 insertions, 35 deletions
diff --git a/drivers/media/platform/soc_camera/mv_sc2_camera.c b/drivers/media/platform/soc_camera/mv_sc2_camera.c
index 755a83b68bc9..17e049a5daf8 100644
--- a/drivers/media/platform/soc_camera/mv_sc2_camera.c
+++ b/drivers/media/platform/soc_camera/mv_sc2_camera.c
@@ -607,31 +607,6 @@ static void mccic_vb2_stop_streaming(struct vb2_queue *vq)
mccic_release_sc2_chs(mcam_dev, mcam_dev->mp.num_planes);
}
-
-
-/* + */
-/* +static void ccic_enable_clk(struct msc2_ccic_dev *ccic_dev) */
-/* +{ */
-/* + /\* TBD *\/ */
-/* +} */
-/* + */
-/* +static void ccic_disable_clk(struct msc2_ccic_dev *ccic_dev) */
-/* +{ */
-/* + /\* TBD *\/ */
-/* +} */
-/* + */
-
-
-
-
-/* + */
-/* +static int mccic_init_clk(struct msc2_ccic_dev *ccic_dev) */
-/* +{ */
-/* + /\* TBD *\/ */
-/* + return 0; */
-/* +} */
-
-
static struct vb2_ops mccic_vb2_ops = {
.queue_setup = mccic_queue_setup,
.buf_init = mccic_vb2_init,
@@ -687,11 +662,8 @@ static int mccic_add_device(struct soc_camera_device *icd)
soc_camera_power_on(&mcam_dev->pdev->dev, ssdd);
/* CCIC/ISP/MMU power on */
sc2_pwr_ctrl(1, SC2_MOD_CCIC);
- /* ccic_enable_clk(mcam_dev); */
clk_set_rate(mcam_dev->mclk, 26000000);
clk_prepare_enable(mcam_dev->mclk);
- /* ccic_power_up(mcam_dev); */
- /* TBD: ccic_stop(mcam_dev); */
mcam_dev->frame_state.frames = 0;
mcam_dev->frame_state.singles = 0;
@@ -792,8 +764,6 @@ put_dma:
msc2_put_ccic_dma(&mcam_dev->dma_dev);
put_mmu:
msc2_put_sc2(&mcam_dev->sc2_mmu);
- /* TBD: ccic_power_down(mcam_dev); */
- /* TBD: ccic_disable_clk(mcam_dev); */
power_off:
sc2_pwr_ctrl(0, SC2_MOD_CCIC);
soc_camera_power_off(&mcam_dev->pdev->dev, ssdd);
@@ -815,8 +785,6 @@ static void mccic_remove_device(struct soc_camera_device *icd)
/* 2. handle HW, clk, power, ccic */
clk_disable_unprepare(mcam_dev->axi_clk);
- /* TBD ccic_power_down(ccic_dev); */
- /* TBD ccic_disable_clk(ccic_dev); */
clk_disable_unprepare(mcam_dev->mclk);
sc2_pwr_ctrl(0, SC2_MOD_CCIC);
/* 3.4 is not necessary */
@@ -1397,7 +1365,6 @@ static int mv_camera_probe(struct platform_device *pdev)
spin_lock_init(&mcam_dev->mcam_lock);
mutex_init(&mcam_dev->s_mutex);
- /* TBD mccic_init_clk(ccic_dev); */
/* 3. setup soc_host */
mcam_dev->soc_host.drv_name = MV_SC2_CAMERA_NAME;
mcam_dev->soc_host.ops = &mcam_soc_camera_host_ops;
@@ -1436,8 +1403,6 @@ MODULE_DEVICE_TABLE(of, mv_sc2_camera_dt_match);
static struct platform_driver mv_sc2_camera_driver = {
.driver = {
.name = MV_SC2_CAMERA_NAME,
- /* TBD */
- /* .pm = &msc2_ccic_pm, */
.of_match_table = of_match_ptr(mv_sc2_camera_dt_match),
},
.probe = mv_camera_probe,