Commit 9066258d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

     5c5a7680 ("platform: Provide a remove callback that returns no value")
     0edb555a ("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()
parents 547fc322 01ecc142

drivers/video/fbdev/amifb.c

+2 −2
Original line number Diff line number Diff line
@@ -3774,7 +3774,7 @@ static void __exit amifb_remove(struct platform_device *pdev) 
 * triggers a section mismatch warning.

 */

static struct platform_driver amifb_driver __refdata = {

	.remove_new = __exit_p(amifb_remove),

	.remove = __exit_p(amifb_remove),

	.driver = {

		.name	= "amiga-video",

	},

drivers/video/fbdev/arcfb.c

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static void arcfb_remove(struct platform_device *dev) 


static struct platform_driver arcfb_driver = {

	.probe	= arcfb_probe,

	.remove_new = arcfb_remove,

	.remove	= arcfb_remove,

	.driver	= {

		.name	= "arcfb",

	},

drivers/video/fbdev/atmel_lcdfb.c

+1 −1
Original line number Diff line number Diff line
@@ -1299,7 +1299,7 @@ static int atmel_lcdfb_resume(struct platform_device *pdev) 


static struct platform_driver atmel_lcdfb_driver = {

	.probe		= atmel_lcdfb_probe,

	.remove_new	= atmel_lcdfb_remove,

	.remove		= atmel_lcdfb_remove,

	.suspend	= atmel_lcdfb_suspend,

	.resume		= atmel_lcdfb_resume,

	.driver		= {

drivers/video/fbdev/au1100fb.c

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ static struct platform_driver au1100fb_driver = { 
		.name		= "au1100-lcd",

	},

	.probe		= au1100fb_drv_probe,

	.remove_new	= au1100fb_drv_remove,

	.remove		= au1100fb_drv_remove,

	.suspend	= au1100fb_drv_suspend,

	.resume		= au1100fb_drv_resume,

};

drivers/video/fbdev/au1200fb.c

+1 −1
Original line number Diff line number Diff line
@@ -1833,7 +1833,7 @@ static struct platform_driver au1200fb_driver = { 
		.pm	= AU1200FB_PMOPS,

	},

	.probe		= au1200fb_drv_probe,

	.remove_new	= au1200fb_drv_remove,

	.remove		= au1200fb_drv_remove,

};

module_platform_driver(au1200fb_driver);