[PATCH 2/4] hitfb: correct sections

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Henrik Kretzschmar
Date: Wednesday, April 28, 2010 - 3:25 am

Since the drivers probe call was changed from .init.text
to .devinit.text in commit c2e13037e6794bd0d9de3f9ecabf5615f15c160b
the fb_fix_screeninfo and fb_var_screeninfo structures must be
changed from .init.data to .devinit.data, too.

Also the drivers remove routine should be moved from
.exit.text to .devexit.text

Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
---
It would be nice if someone with a SH gcc could test this patch and
give me some feedback if it works the way it should, since atm I'm lacking
a crosscompiler setup.
---
 drivers/video/hitfb.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index 393f3f3..cfb8d64 100644
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -30,14 +30,14 @@
 
 #define	WIDTH 640
 
-static struct fb_var_screeninfo hitfb_var __initdata = {
+static struct fb_var_screeninfo hitfb_var __devinitdata = {
 	.activate	= FB_ACTIVATE_NOW,
 	.height		= -1,
 	.width		= -1,
 	.vmode		= FB_VMODE_NONINTERLACED,
 };
 
-static struct fb_fix_screeninfo hitfb_fix __initdata = {
+static struct fb_fix_screeninfo hitfb_fix __devinitdata = {
 	.id		= "Hitachi HD64461",
 	.type		= FB_TYPE_PACKED_PIXELS,
 	.accel		= FB_ACCEL_NONE,
@@ -417,7 +417,7 @@ err_fb:
 	return ret;
 }
 
-static int __exit hitfb_remove(struct platform_device *dev)
+static int __devexit hitfb_remove(struct platform_device *dev)
 {
 	struct fb_info *info = platform_get_drvdata(dev);
 
@@ -462,7 +462,7 @@ static const struct dev_pm_ops hitfb_dev_pm_ops = {
 
 static struct platform_driver hitfb_driver = {
 	.probe		= hitfb_probe,
-	.remove		= __exit_p(hitfb_remove),
+	.remove		= __devexit_p(hitfb_remove),
 	.driver		= {
 		.name	= "hitfb",
 		.owner	= THIS_MODULE,
-- 
1.7.0

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 1/4] cocbalt_lcdfb: correct sections, Henrik Kretzschmar, (Wed Apr 28, 3:25 am)
[PATCH 2/4] hitfb: correct sections, Henrik Kretzschmar, (Wed Apr 28, 3:25 am)
[PATCH 3/4] s3c2410fb: correct sections, Henrik Kretzschmar, (Wed Apr 28, 3:25 am)
[PATCH 4/4] sgivwfb: correct sections, Henrik Kretzschmar, (Wed Apr 28, 3:25 am)
Re: [PATCH 1/4] cocbalt_lcdfb: correct sections, Ralf Baechle, (Wed Apr 28, 7:32 am)
Re: [PATCH 3/4] s3c2410fb: correct sections, Arnaud Patard, (Wed Apr 28, 2:16 pm)