1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 49619b441500..a45b37c2e88e 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -586,7 +586,7 @@ static struct fb_ops mxsfb_ops = {
         .fb_imageblit = cfb_imageblit,
 };
 
-static int __devinit mxsfb_restore_mode(struct mxsfb_info *host)
+static int mxsfb_restore_mode(struct mxsfb_info *host)
 {
         struct fb_info *fb_info = &host->fb_info;
         unsigned line_count;
@@ -677,7 +677,7 @@ static int __devinit mxsfb_restore_mode(struct mxsfb_info *host)
         return 0;
 }
 
-static int __devinit mxsfb_init_fbinfo(struct mxsfb_info *host)
+static int mxsfb_init_fbinfo(struct mxsfb_info *host)
 {
         struct fb_info *fb_info = &host->fb_info;
         struct fb_var_screeninfo *var = &fb_info->var;
@@ -739,7 +739,7 @@ static int __devinit mxsfb_init_fbinfo(struct mxsfb_info *host)
         return 0;
 }
 
-static void __devexit mxsfb_free_videomem(struct mxsfb_info *host)
+static void mxsfb_free_videomem(struct mxsfb_info *host)
 {
         struct fb_info *fb_info = &host->fb_info;
 
@@ -772,7 +772,7 @@ static const struct of_device_id mxsfb_dt_ids[] = {
 };
 MODULE_DEVICE_TABLE(of, mxsfb_dt_ids);
 
-static int __devinit mxsfb_probe(struct platform_device *pdev)
+static int mxsfb_probe(struct platform_device *pdev)
 {
         const struct of_device_id *of_id =
                         of_match_device(mxsfb_dt_ids, &pdev->dev);
@@ -912,7 +912,7 @@ error_alloc_info:
         return ret;
 }
 
-static int __devexit mxsfb_remove(struct platform_device *pdev)
+static int mxsfb_remove(struct platform_device *pdev)
 {
         struct fb_info *fb_info = platform_get_drvdata(pdev);
         struct mxsfb_info *host = to_imxfb_host(fb_info);
@@ -949,7 +949,7 @@ static void mxsfb_shutdown(struct platform_device *pdev)
 
 static struct platform_driver mxsfb_driver = {
         .probe = mxsfb_probe,
-        .remove = __devexit_p(mxsfb_remove),
+        .remove = mxsfb_remove,
         .shutdown = mxsfb_shutdown,
         .id_table = mxsfb_devtype,
         .driver = {