From 76c91bdcd73c03ced2f4d54815a6715baba3f0d2 Mon Sep 17 00:00:00 2001 From: Kamil Debski Date: Mon, 8 Aug 2011 13:12:51 -0300 Subject: [PATCH] --- yaml --- r: 271860 b: refs/heads/master c: 1e393e90ab444dd24d28448e92bab099703fd006 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-mfc/s5p_mfc.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f37ec4eb34b0..cf89f10fe580 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae11e354b80fabdb57ca09a7ff26a89a79396034 +refs/heads/master: 1e393e90ab444dd24d28448e92bab099703fd006 diff --git a/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c b/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c index af32e020c527..8be8b54eb749 100644 --- a/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c +++ b/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c @@ -940,9 +940,8 @@ static int match_child(struct device *dev, void *data) return !strcmp(dev_name(dev), (char *)data); } - /* MFC probe function */ -static int __devinit s5p_mfc_probe(struct platform_device *pdev) +static int s5p_mfc_probe(struct platform_device *pdev) { struct s5p_mfc_dev *dev; struct video_device *vfd; @@ -1236,7 +1235,7 @@ static const struct dev_pm_ops s5p_mfc_pm_ops = { NULL) }; -static struct platform_driver s5p_mfc_pdrv = { +static struct platform_driver s5p_mfc_driver = { .probe = s5p_mfc_probe, .remove = __devexit_p(s5p_mfc_remove), .driver = { @@ -1254,15 +1253,15 @@ static int __init s5p_mfc_init(void) int ret; pr_info("%s", banner); - ret = platform_driver_register(&s5p_mfc_pdrv); + ret = platform_driver_register(&s5p_mfc_driver); if (ret) pr_err("Platform device registration failed.\n"); return ret; } -static void __devexit s5p_mfc_exit(void) +static void __exit s5p_mfc_exit(void) { - platform_driver_unregister(&s5p_mfc_pdrv); + platform_driver_unregister(&s5p_mfc_driver); } module_init(s5p_mfc_init);