diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-27 21:19:51 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-27 21:19:51 +0300 |
| commit | 725a345b2ee3c24f9ac2078eb73667e22a1b7214 (patch) | |
| tree | f8ed5ffbbc1abdcd372dce908379fba92c29b9be /drivers/video/fbdev/wmt_ge_rops.c | |
| parent | 89555eebb9fb603ad43c0def8ab35e76c210002f (diff) | |
| parent | 60ed3cd85b95184936bce70ed7f9e76a6a54a5e1 (diff) | |
| download | linux-725a345b2ee3c24f9ac2078eb73667e22a1b7214.tar.xz | |
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
...
Diffstat (limited to 'drivers/video/fbdev/wmt_ge_rops.c')
| -rw-r--r-- | drivers/video/fbdev/wmt_ge_rops.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/fbdev/wmt_ge_rops.c b/drivers/video/fbdev/wmt_ge_rops.c index 42255d27a1db..6196b9a6c44d 100644 --- a/drivers/video/fbdev/wmt_ge_rops.c +++ b/drivers/video/fbdev/wmt_ge_rops.c @@ -145,10 +145,9 @@ static int wmt_ge_rops_probe(struct platform_device *pdev) return 0; } -static int wmt_ge_rops_remove(struct platform_device *pdev) +static void wmt_ge_rops_remove(struct platform_device *pdev) { iounmap(regbase); - return 0; } static const struct of_device_id wmt_dt_ids[] = { @@ -158,7 +157,7 @@ static const struct of_device_id wmt_dt_ids[] = { static struct platform_driver wmt_ge_rops_driver = { .probe = wmt_ge_rops_probe, - .remove = wmt_ge_rops_remove, + .remove_new = wmt_ge_rops_remove, .driver = { .name = "wmt_ge_rops", .of_match_table = wmt_dt_ids, |