diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-21 16:59:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-21 16:59:23 -0800 |
| commit | b8878e5a5c62a16ad491ba664a9c1efff62e9a99 (patch) | |
| tree | 3bd00c8043617d83a1b05124b8956729fa2977bf /drivers/video | |
| parent | 8bf1a529cd664c8e5268381f1e24fe67aa611dd3 (diff) | |
| parent | b14033a3e6ba73a5c68974a80b05cba55553ed5b (diff) | |
Merge tag 'hyperv-next-signed-20230220' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
Pull hyperv updates from Wei Liu:
- allow Linux to run as the nested root partition for Microsoft
Hypervisor (Jinank Jain and Nuno Das Neves)
- clean up the return type of callback functions (Dawei Li)
* tag 'hyperv-next-signed-20230220' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
x86/hyperv: Fix hv_get/set_register for nested bringup
Drivers: hv: Make remove callback of hyperv driver void returned
Drivers: hv: Enable vmbus driver for nested root partition
x86/hyperv: Add an interface to do nested hypercalls
Drivers: hv: Setup synic registers in case of nested root partition
x86/hyperv: Add support for detecting nested hypervisor
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/hyperv_fb.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index fdbf02b42723..a7f79f51f40c 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c @@ -1239,8 +1239,7 @@ error1: return ret; } - -static int hvfb_remove(struct hv_device *hdev) +static void hvfb_remove(struct hv_device *hdev) { struct fb_info *info = hv_get_drvdata(hdev); struct hvfb_par *par = info->par; @@ -1261,8 +1260,6 @@ static int hvfb_remove(struct hv_device *hdev) hvfb_putmem(hdev, info); framebuffer_release(info); - - return 0; } static int hvfb_suspend(struct hv_device *hdev) |