aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/davinci/vpif.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/platform/davinci/vpif.c')
-rw-r--r--drivers/media/platform/davinci/vpif.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c
index 0d6cc8e4deb2..28638a86f129 100644
--- 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)
419} 419}
420EXPORT_SYMBOL(vpif_channel_getfid); 420EXPORT_SYMBOL(vpif_channel_getfid);
421 421
422static int __devinit vpif_probe(struct platform_device *pdev) 422static int vpif_probe(struct platform_device *pdev)
423{ 423{
424 int status = 0; 424 int status = 0;
425 425
@@ -457,7 +457,7 @@ fail:
457 return status; 457 return status;
458} 458}
459 459
460static int __devexit vpif_remove(struct platform_device *pdev) 460static int vpif_remove(struct platform_device *pdev)
461{ 461{
462 if (vpif_clk) { 462 if (vpif_clk) {
463 clk_disable_unprepare(vpif_clk); 463 clk_disable_unprepare(vpif_clk);
@@ -498,7 +498,7 @@ static struct platform_driver vpif_driver = {
498 .owner = THIS_MODULE, 498 .owner = THIS_MODULE,
499 .pm = vpif_pm_ops, 499 .pm = vpif_pm_ops,
500 }, 500 },
501 .remove = __devexit_p(vpif_remove), 501 .remove = vpif_remove,
502 .probe = vpif_probe, 502 .probe = vpif_probe,
503}; 503};
504 504