Commit 725a345b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-for-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev 

Pull fbdev updates from Helge Deller:
 "Nothing really exiting in here.

  The majority of lines changed is due to Uwe's preparation patches to
  change the return value of the .remove() callback to void.

  Summary:

   - vt_buffer.h: Fix build on alpha (Randy Dunlap)

   - mmp: Clock handling fix (Christophe JAILLET)

   - 68328fb, ps3fb, vfb: Init .owner field of struct fb_ops (Thomas
     Zimmermann)

   - fbdev: cg14: Convert to platform remove callback returning void

   - Preparation patches to convert drivers to return void in .remove()
     callback (Uwe Kleine-König)

   - Drop Paul Mackerras as rage128 maintainer"

* tag 'fbdev-for-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: (51 commits)
  MAINTAINERS: Remove rage128 framebuffer driver maintainer
  fbdev: vfb: Init owner field of struct fb_ops
  fbdev: ps3fb: Init owner field of struct fb_ops
  fbdev: 68328fb: Init owner field of struct fb_ops
  fbdev: mmp: Fix deferred clk handling in mmphw_probe()
  linux/vt_buffer.h: allow either builtin or modular for macros
  fbdev: xilinxfb: Convert to platform remove callback returning void
  fbdev: wmt_ge_rops: Convert to platform remove callback returning void
  fbdev: wm8505fb: Convert to platform remove callback returning void
  fbdev: vt8500lcdfb: Convert to platform remove callback returning void
  fbdev: via: Convert to platform remove callback returning void
  fbdev: vga16fb: Convert to platform remove callback returning void
  fbdev: vfb: Convert to platform remove callback returning void
  fbdev: vesafb: Convert to platform remove callback returning void
  fbdev: uvesafb: Convert to platform remove callback returning void
  fbdev: tcx: Convert to platform remove callback returning void
  fbdev: sm501fb: Convert to platform remove callback returning void
  fbdev: simplefb: Convert to platform remove callback returning void
  fbdev: sh_mobile_lcdcfb: Convert to platform remove callback returning void
  fbdev: sh7760fb: Convert to platform remove callback returning void
  ...
parents 89555eeb 60ed3cd8

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -17571,9 +17571,8 @@ F: drivers/block/rbd.c 
F:	drivers/block/rbd_types.h









RAGE128 FRAMEBUFFER DISPLAY DRIVER









M:	Paul Mackerras <paulus@samba.org>









L:	linux-fbdev@vger.kernel.org









S:	Maintained









S:	Orphan









F:	drivers/video/fbdev/aty/aty128fb.c

















RAINSHADOW-CEC DRIVER

























drivers/video/fbdev/68328fb.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -94,6 +94,7 @@ static int mc68x328fb_pan_display(struct fb_var_screeninfo *var,







static int mc68x328fb_mmap(struct fb_info *info, struct vm_area_struct *vma);



















static const struct fb_ops mc68x328fb_ops = {









	.owner		= THIS_MODULE,









	.fb_check_var	= mc68x328fb_check_var,









	.fb_set_par	= mc68x328fb_set_par,









	.fb_setcolreg	= mc68x328fb_setcolreg,
































drivers/video/fbdev/cg14.c



+2
−4






























Original line number
Diff line number
Diff line







@@ -569,7 +569,7 @@ static int cg14_probe(struct platform_device *op)







	return err;









}



















static int cg14_remove(struct platform_device *op)









static void cg14_remove(struct platform_device *op)









{









	struct fb_info *info = dev_get_drvdata(&op->dev);









	struct cg14_par *par = info->par;








@@ -580,8 +580,6 @@ static int cg14_remove(struct platform_device *op)







	cg14_unmap_regs(op, info, par);



















	framebuffer_release(info);



















	return 0;









}



















static const struct of_device_id cg14_match[] = {








@@ -598,7 +596,7 @@ static struct platform_driver cg14_driver = {







		.of_match_table = cg14_match,









	},









	.probe		= cg14_probe,









	.remove		= cg14_remove,









	.remove_new	= cg14_remove,









};



















static int __init cg14_init(void)
































drivers/video/fbdev/cg3.c



+2
−4






























Original line number
Diff line number
Diff line







@@ -434,7 +434,7 @@ static int cg3_probe(struct platform_device *op)







	return err;









}



















static int cg3_remove(struct platform_device *op)









static void cg3_remove(struct platform_device *op)









{









	struct fb_info *info = dev_get_drvdata(&op->dev);









	struct cg3_par *par = info->par;








@@ -446,8 +446,6 @@ static int cg3_remove(struct platform_device *op)







	of_iounmap(&op->resource[0], info->screen_base, info->fix.smem_len);



















	framebuffer_release(info);



















	return 0;









}



















static const struct of_device_id cg3_match[] = {








@@ -467,7 +465,7 @@ static struct platform_driver cg3_driver = {







		.of_match_table = cg3_match,









	},









	.probe		= cg3_probe,









	.remove		= cg3_remove,









	.remove_new	= cg3_remove,









};



















static int __init cg3_init(void)
































drivers/video/fbdev/cg6.c



+2
−4






























Original line number
Diff line number
Diff line







@@ -828,7 +828,7 @@ static int cg6_probe(struct platform_device *op)







	return err;









}



















static int cg6_remove(struct platform_device *op)









static void cg6_remove(struct platform_device *op)









{









	struct fb_info *info = dev_get_drvdata(&op->dev);









	struct cg6_par *par = info->par;








@@ -839,8 +839,6 @@ static int cg6_remove(struct platform_device *op)







	cg6_unmap_regs(op, info, par);



















	framebuffer_release(info);



















	return 0;









}



















static const struct of_device_id cg6_match[] = {








@@ -860,7 +858,7 @@ static struct platform_driver cg6_driver = {







		.of_match_table = cg6_match,









	},









	.probe		= cg6_probe,









	.remove		= cg6_remove,









	.remove_new	= cg6_remove,









};



















static int __init cg6_init(void)