Drivers: media: remove __dev* attributes.

[deliverable/linux.git] / drivers / media / platform / davinci / dm355_ccdc.c

diff --git a/drivers/media/platform/davinci/dm355_ccdc.c b/drivers/media/platform/davinci/dm355_ccdc.c
index ce0e4131c0672ba882c6a45b819ed7dfe2b960ae..f263cabade7af0d7b8f315fdce1102160b5d3610 100644 (file)
--- a/drivers/media/platform/davinci/dm355_ccdc.c
+++ b/drivers/media/platform/davinci/dm355_ccdc.c
@@ -965,7 +965,7 @@ static struct ccdc_hw_device ccdc_hw_dev = {
        },
 };
 
-static int __devinit dm355_ccdc_probe(struct platform_device *pdev)
+static int dm355_ccdc_probe(struct platform_device *pdev)
 {
        void (*setup_pinmux)(void);
        struct resource *res;
@@ -1003,7 +1003,7 @@ static int __devinit dm355_ccdc_probe(struct platform_device *pdev)
                status = PTR_ERR(ccdc_cfg.mclk);
                goto fail_nomap;
        }
-       if (clk_enable(ccdc_cfg.mclk)) {
+       if (clk_prepare_enable(ccdc_cfg.mclk)) {
                status = -ENODEV;
                goto fail_mclk;
        }
@@ -1014,7 +1014,7 @@ static int __devinit dm355_ccdc_probe(struct platform_device *pdev)
                status = PTR_ERR(ccdc_cfg.sclk);
                goto fail_mclk;
        }
-       if (clk_enable(ccdc_cfg.sclk)) {
+       if (clk_prepare_enable(ccdc_cfg.sclk)) {
                status = -ENODEV;
                goto fail_sclk;
        }
@@ -1034,8 +1034,10 @@ static int __devinit dm355_ccdc_probe(struct platform_device *pdev)
        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);
@@ -1050,6 +1052,8 @@ 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);
@@ -1065,7 +1069,7 @@ static struct platform_driver dm355_ccdc_driver = {
                .name   = "dm355_ccdc",
                .owner = THIS_MODULE,
        },
-       .remove = __devexit_p(dm355_ccdc_remove),
+       .remove = dm355_ccdc_remove,
        .probe = dm355_ccdc_probe,
 };