OMAPFB: add __init & __exit
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 17 Feb 2012 15:43:03 +0000 (17:43 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 11 May 2012 11:44:52 +0000 (14:44 +0300)
Change omapfb to use platform_driver_probe and add __init & __exit.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/omap2/omapfb/omapfb-main.c

index 7f02e7f..165a4be 100644 (file)
@@ -2307,7 +2307,7 @@ static int omapfb_init_display(struct omapfb2_device *fbdev,
        return 0;
 }
 
-static int omapfb_probe(struct platform_device *pdev)
+static int __init omapfb_probe(struct platform_device *pdev)
 {
        struct omapfb2_device *fbdev = NULL;
        int r = 0;
@@ -2448,7 +2448,7 @@ err0:
        return r;
 }
 
-static int omapfb_remove(struct platform_device *pdev)
+static int __exit omapfb_remove(struct platform_device *pdev)
 {
        struct omapfb2_device *fbdev = platform_get_drvdata(pdev);
 
@@ -2462,8 +2462,7 @@ static int omapfb_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver omapfb_driver = {
-       .probe          = omapfb_probe,
-       .remove         = omapfb_remove,
+       .remove         = __exit_p(omapfb_remove),
        .driver         = {
                .name   = "omapfb",
                .owner  = THIS_MODULE,
@@ -2474,7 +2473,7 @@ static int __init omapfb_init(void)
 {
        DBG("omapfb_init\n");
 
-       if (platform_driver_register(&omapfb_driver)) {
+       if (platform_driver_probe(&omapfb_driver, omapfb_probe)) {
                printk(KERN_ERR "failed to register omapfb driver\n");
                return -ENODEV;
        }