Drivers: media: remove __dev* attributes.

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

diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c
index cff3c0ab501f6751c745fbdf9461a3dc745f837e..28638a86f12964c9ab81e3d5bd99d9ba495429a7 100644 (file)
--- a/drivers/media/platform/davinci/vpif.c
+++ b/drivers/media/platform/davinci/vpif.c
@@ -419,7 +419,7 @@ int vpif_channel_getfid(u8 channel_id)
 }
 EXPORT_SYMBOL(vpif_channel_getfid);
 
-static int __devinit vpif_probe(struct platform_device *pdev)
+static int vpif_probe(struct platform_device *pdev)
 {
        int status = 0;
 
@@ -444,7 +444,7 @@ static int __devinit vpif_probe(struct platform_device *pdev)
                status = PTR_ERR(vpif_clk);
                goto clk_fail;
        }
-       clk_enable(vpif_clk);
+       clk_prepare_enable(vpif_clk);
 
        spin_lock_init(&vpif_lock);
        dev_info(&pdev->dev, "vpif probe success\n");
@@ -457,10 +457,10 @@ fail:
        return status;
 }
 
-static int __devexit vpif_remove(struct platform_device *pdev)
+static int vpif_remove(struct platform_device *pdev)
 {
        if (vpif_clk) {
-               clk_disable(vpif_clk);
+               clk_disable_unprepare(vpif_clk);
                clk_put(vpif_clk);
        }
 
@@ -472,13 +472,13 @@ static int __devexit vpif_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int vpif_suspend(struct device *dev)
 {
-       clk_disable(vpif_clk);
+       clk_disable_unprepare(vpif_clk);
        return 0;
 }
 
 static int vpif_resume(struct device *dev)
 {
-       clk_enable(vpif_clk);
+       clk_prepare_enable(vpif_clk);
        return 0;
 }
 
@@ -498,7 +498,7 @@ static struct platform_driver vpif_driver = {
                .owner = THIS_MODULE,
                .pm     = vpif_pm_ops,
        },
-       .remove = __devexit_p(vpif_remove),
+       .remove = vpif_remove,
        .probe = vpif_probe,
 };