Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit e88a0f461aeadfe309d36a2a4fac9ffb1b0ed651

Authored by Henrik Kretzschmar
Committed by Linus Torvalds
1 parent 49c39b4953
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

hitfb: fix sections 

Since the drivers probe call was changed from .init.text to .devinit.text
in commit c2e13037e6794bd0d9de3f9ecabf5615f15c160b ("platform-drivers:
move probe to .devinit.text in drivers/video") 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>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

drivers/video/hitfb.c
Diff comments   View file @ e88a0f4
... ... @@ -30,14 +30,14 @@
30 30  
31 31 #define WIDTH 640
32 32  
33   -static struct fb_var_screeninfo hitfb_var __initdata = {
  33 +static struct fb_var_screeninfo hitfb_var __devinitdata = {
34 34 .activate = FB_ACTIVATE_NOW,
35 35 .height = -1,
36 36 .width = -1,
37 37 .vmode = FB_VMODE_NONINTERLACED,
38 38 };
39 39  
40   -static struct fb_fix_screeninfo hitfb_fix __initdata = {
  40 +static struct fb_fix_screeninfo hitfb_fix __devinitdata = {
41 41 .id = "Hitachi HD64461",
42 42 .type = FB_TYPE_PACKED_PIXELS,
43 43 .accel = FB_ACCEL_NONE,
... ... @@ -417,7 +417,7 @@
417 417 return ret;
418 418 }
419 419  
420   -static int __exit hitfb_remove(struct platform_device *dev)
  420 +static int __devexit hitfb_remove(struct platform_device *dev)
421 421 {
422 422 struct fb_info *info = platform_get_drvdata(dev);
423 423  
... ... @@ -462,7 +462,7 @@
462 462  
463 463 static struct platform_driver hitfb_driver = {
464 464 .probe = hitfb_probe,
465   - .remove = __exit_p(hitfb_remove),
  465 + .remove = __devexit_p(hitfb_remove),
466 466 .driver = {
467 467 .name = "hitfb",
468 468 .owner = THIS_MODULE,