Skip to content

Commit 9066258

Browse files
committed
Merge tag 'fbdev-for-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev
Pull fbdev platform driver fix from Helge Deller: "Switch fbdev drivers back to struct platform_driver::remove() Now that 'remove()' has been converted to the sane new API, there's no reason for the 'remove_new()' use, so this converts back to the traditional and simpler name. See commits 5c5a768 ("platform: Provide a remove callback that returns no value") 0edb555 ("platform: Make platform_driver::remove() return void") for background to this all" * tag 'fbdev-for-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: fbdev: Switch back to struct platform_driver::remove()
2 parents 547fc32 + 01ecc14 commit 9066258

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+88
-88
lines changed

drivers/video/fbdev/amifb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3774,8 +3774,8 @@ static void __exit amifb_remove(struct platform_device *pdev)
37743774
* triggers a section mismatch warning.
37753775
*/
37763776
static struct platform_driver amifb_driver __refdata = {
3777-
.remove_new = __exit_p(amifb_remove),
3778-
.driver = {
3777+
.remove = __exit_p(amifb_remove),
3778+
.driver = {
37793779
.name = "amiga-video",
37803780
},
37813781
};

drivers/video/fbdev/arcfb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ static void arcfb_remove(struct platform_device *dev)
548548

549549
static struct platform_driver arcfb_driver = {
550550
.probe = arcfb_probe,
551-
.remove_new = arcfb_remove,
551+
.remove = arcfb_remove,
552552
.driver = {
553553
.name = "arcfb",
554554
},

drivers/video/fbdev/atmel_lcdfb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1299,7 +1299,7 @@ static int atmel_lcdfb_resume(struct platform_device *pdev)
12991299

13001300
static struct platform_driver atmel_lcdfb_driver = {
13011301
.probe = atmel_lcdfb_probe,
1302-
.remove_new = atmel_lcdfb_remove,
1302+
.remove = atmel_lcdfb_remove,
13031303
.suspend = atmel_lcdfb_suspend,
13041304
.resume = atmel_lcdfb_resume,
13051305
.driver = {

drivers/video/fbdev/au1100fb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ static struct platform_driver au1100fb_driver = {
588588
.name = "au1100-lcd",
589589
},
590590
.probe = au1100fb_drv_probe,
591-
.remove_new = au1100fb_drv_remove,
591+
.remove = au1100fb_drv_remove,
592592
.suspend = au1100fb_drv_suspend,
593593
.resume = au1100fb_drv_resume,
594594
};

drivers/video/fbdev/au1200fb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1833,7 +1833,7 @@ static struct platform_driver au1200fb_driver = {
18331833
.pm = AU1200FB_PMOPS,
18341834
},
18351835
.probe = au1200fb_drv_probe,
1836-
.remove_new = au1200fb_drv_remove,
1836+
.remove = au1200fb_drv_remove,
18371837
};
18381838
module_platform_driver(au1200fb_driver);
18391839

drivers/video/fbdev/broadsheetfb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,7 @@ static void broadsheetfb_remove(struct platform_device *dev)
11511151

11521152
static struct platform_driver broadsheetfb_driver = {
11531153
.probe = broadsheetfb_probe,
1154-
.remove_new = broadsheetfb_remove,
1154+
.remove = broadsheetfb_remove,
11551155
.driver = {
11561156
.name = "broadsheetfb",
11571157
},

drivers/video/fbdev/bw2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ static struct platform_driver bw2_driver = {
372372
.of_match_table = bw2_match,
373373
},
374374
.probe = bw2_probe,
375-
.remove_new = bw2_remove,
375+
.remove = bw2_remove,
376376
};
377377

378378
static int __init bw2_init(void)

drivers/video/fbdev/cg14.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ static struct platform_driver cg14_driver = {
590590
.of_match_table = cg14_match,
591591
},
592592
.probe = cg14_probe,
593-
.remove_new = cg14_remove,
593+
.remove = cg14_remove,
594594
};
595595

596596
static int __init cg14_init(void)

drivers/video/fbdev/cg3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ static struct platform_driver cg3_driver = {
458458
.of_match_table = cg3_match,
459459
},
460460
.probe = cg3_probe,
461-
.remove_new = cg3_remove,
461+
.remove = cg3_remove,
462462
};
463463

464464
static int __init cg3_init(void)

drivers/video/fbdev/cg6.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ static struct platform_driver cg6_driver = {
858858
.of_match_table = cg6_match,
859859
},
860860
.probe = cg6_probe,
861-
.remove_new = cg6_remove,
861+
.remove = cg6_remove,
862862
};
863863

864864
static int __init cg6_init(void)

0 commit comments

Comments
 (0)