diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-06-19 08:59:52 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-06-19 09:01:25 +0300 |
| commit | cce3b573a52a41dd7face9dbf745f10f9bf4632b (patch) | |
| tree | 4540c11587221cfb90ac9cfb7916b2d2c17c6127 /drivers/video/fbdev/broadsheetfb.c | |
| parent | bcbede6fbeb0e1eb85ccbb532faf06d3b31f0e73 (diff) | |
| parent | 45a3e24f65e90a047bef86f927ebdc4c710edaa1 (diff) | |
| download | linux-cce3b573a52a41dd7face9dbf745f10f9bf4632b.tar.xz | |
Backmerge tag 'v6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
Linux 6.4-rc7
Need this to pull in the msm work.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/video/fbdev/broadsheetfb.c')
| -rw-r--r-- | drivers/video/fbdev/broadsheetfb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/fbdev/broadsheetfb.c b/drivers/video/fbdev/broadsheetfb.c index e9c5d5c04062..5f18af88e740 100644 --- a/drivers/video/fbdev/broadsheetfb.c +++ b/drivers/video/fbdev/broadsheetfb.c @@ -1193,7 +1193,7 @@ err: } -static int broadsheetfb_remove(struct platform_device *dev) +static void broadsheetfb_remove(struct platform_device *dev) { struct fb_info *info = platform_get_drvdata(dev); @@ -1209,12 +1209,11 @@ static int broadsheetfb_remove(struct platform_device *dev) module_put(par->board->owner); framebuffer_release(info); } - return 0; } static struct platform_driver broadsheetfb_driver = { .probe = broadsheetfb_probe, - .remove = broadsheetfb_remove, + .remove_new = broadsheetfb_remove, .driver = { .name = "broadsheetfb", }, |