diff options
author | Dave Airlie <airlied@redhat.com> | 2023-06-19 15:59:52 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2023-06-19 16:01:25 +1000 |
commit | cce3b573a52a41dd7face9dbf745f10f9bf4632b (patch) | |
tree | 4540c11587221cfb90ac9cfb7916b2d2c17c6127 /drivers/video/fbdev/arcfb.c | |
parent | bcbede6fbeb0e1eb85ccbb532faf06d3b31f0e73 (diff) | |
parent | 45a3e24f65e90a047bef86f927ebdc4c710edaa1 (diff) |
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/arcfb.c')
-rw-r--r-- | drivers/video/fbdev/arcfb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c index 3d926c3ada73..9aaea3be8281 100644 --- a/drivers/video/fbdev/arcfb.c +++ b/drivers/video/fbdev/arcfb.c @@ -594,7 +594,7 @@ err_fb_alloc: return retval; } -static int arcfb_remove(struct platform_device *dev) +static void arcfb_remove(struct platform_device *dev) { struct fb_info *info = platform_get_drvdata(dev); @@ -605,12 +605,11 @@ static int arcfb_remove(struct platform_device *dev) vfree(info->screen_buffer); framebuffer_release(info); } - return 0; } static struct platform_driver arcfb_driver = { .probe = arcfb_probe, - .remove = arcfb_remove, + .remove_new = arcfb_remove, .driver = { .name = "arcfb", }, |