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/hid | |
| 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/hid')
| -rw-r--r-- | drivers/hid/hid-hyperv.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c index cf12f17e6533..2a0aabd50a45 100644 --- a/drivers/hid/hid-hyperv.c +++ b/drivers/hid/hid-hyperv.c @@ -524,7 +524,7 @@ probe_err0: } -static int mousevsc_remove(struct hv_device *dev) +static void mousevsc_remove(struct hv_device *dev) { struct mousevsc_dev *input_dev = hv_get_drvdata(dev); @@ -533,8 +533,6 @@ static int mousevsc_remove(struct hv_device *dev) hid_hw_stop(input_dev->hid_device); hid_destroy_device(input_dev->hid_device); mousevsc_free_device(input_dev); - - return 0; } static int mousevsc_suspend(struct hv_device *dev) |