1 files changed, 6 insertions, 43 deletions

diff --git a/drivers/media/platform/davinci/dm355_ccdc.c b/drivers/media/platform/davinci/dm355_ccdc.c
index 4277e4ad810c..05f8fb7f7b70 100644
--- a/drivers/media/platform/davinci/dm355_ccdc.c
+++ b/drivers/media/platform/davinci/dm355_ccdc.c
@@ -37,7 +37,6 @@
 #include <linux/platform_device.h>
 #include <linux/uaccess.h>
 #include <linux/videodev2.h>
-#include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/module.h>
 
@@ -59,10 +58,6 @@ static struct ccdc_oper_config {
         struct ccdc_params_raw bayer;
         /* YCbCr configuration */
         struct ccdc_params_ycbcr ycbcr;
-        /* Master clock */
-        struct clk *mclk;
-        /* slave clock */
-        struct clk *sclk;
         /* ccdc base address */
         void __iomem *base_addr;
 } ccdc_cfg = {
@@ -85,7 +80,7 @@ static struct ccdc_oper_config {
                         .mfilt1 = CCDC_NO_MEDIAN_FILTER1,
                         .mfilt2 = CCDC_NO_MEDIAN_FILTER2,
                         .alaw = {
-                                .gama_wd = 2,
+                                .gamma_wd = 2,
                         },
                         .blk_clamp = {
                                 .sample_pixel = 1,
@@ -303,8 +298,8 @@ static int validate_ccdc_param(struct ccdc_config_params_raw *ccdcparam)
         }
 
         if (ccdcparam->alaw.enable) {
-                if (ccdcparam->alaw.gama_wd < CCDC_GAMMA_BITS_13_4 ||
-                    ccdcparam->alaw.gama_wd > CCDC_GAMMA_BITS_09_0) {
+                if (ccdcparam->alaw.gamma_wd < CCDC_GAMMA_BITS_13_4 ||
+                    ccdcparam->alaw.gamma_wd > CCDC_GAMMA_BITS_09_0) {
                         dev_dbg(ccdc_cfg.dev, "Invalid value of ALAW\n");
                         return -EINVAL;
                 }
@@ -680,8 +675,8 @@ static int ccdc_config_raw(void)
         /* Enable and configure aLaw register if needed */
         if (config_params->alaw.enable) {
                 val |= (CCDC_ALAW_ENABLE |
-                        ((config_params->alaw.gama_wd &
-                        CCDC_ALAW_GAMA_WD_MASK) <<
+                        ((config_params->alaw.gamma_wd &
+                        CCDC_ALAW_GAMMA_WD_MASK) <<
                         CCDC_GAMMAWD_INPUT_SHIFT));
         }
 
@@ -997,32 +992,10 @@ static int dm355_ccdc_probe(struct platform_device *pdev)
                 goto fail_nomem;
         }
 
-        /* Get and enable Master clock */
-        ccdc_cfg.mclk = clk_get(&pdev->dev, "master");
-        if (IS_ERR(ccdc_cfg.mclk)) {
-                status = PTR_ERR(ccdc_cfg.mclk);
-                goto fail_nomap;
-        }
-        if (clk_prepare_enable(ccdc_cfg.mclk)) {
-                status = -ENODEV;
-                goto fail_mclk;
-        }
-
-        /* Get and enable Slave clock */
-        ccdc_cfg.sclk = clk_get(&pdev->dev, "slave");
-        if (IS_ERR(ccdc_cfg.sclk)) {
-                status = PTR_ERR(ccdc_cfg.sclk);
-                goto fail_mclk;
-        }
-        if (clk_prepare_enable(ccdc_cfg.sclk)) {
-                status = -ENODEV;
-                goto fail_sclk;
-        }
-
         /* Platform data holds setup_pinmux function ptr */
         if (NULL == pdev->dev.platform_data) {
                 status = -ENODEV;
-                goto fail_sclk;
+                goto fail_nomap;
         }
         setup_pinmux = pdev->dev.platform_data;
         /*
@@ -1033,12 +1006,6 @@ static int dm355_ccdc_probe(struct platform_device *pdev)
         ccdc_cfg.dev = &pdev->dev;
         printk(KERN_NOTICE "%s is registered with vpfe.\n", ccdc_hw_dev.name);
         return 0;
-fail_sclk:
-        clk_disable_unprepare(ccdc_cfg.sclk);
-        clk_put(ccdc_cfg.sclk);
-fail_mclk:
-        clk_disable_unprepare(ccdc_cfg.mclk);
-        clk_put(ccdc_cfg.mclk);
 fail_nomap:
         iounmap(ccdc_cfg.base_addr);
 fail_nomem:
@@ -1052,10 +1019,6 @@ static int dm355_ccdc_remove(struct platform_device *pdev)
 {
         struct resource *res;
 
-        clk_disable_unprepare(ccdc_cfg.sclk);
-        clk_disable_unprepare(ccdc_cfg.mclk);
-        clk_put(ccdc_cfg.mclk);
-        clk_put(ccdc_cfg.sclk);
         iounmap(ccdc_cfg.base_addr);
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res)