diff options
| author | Linus Torvalds <[email protected]> | 2023-01-12 23:02:20 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2023-01-12 23:02:20 +0000 |
| commit | bad8c4a850eaf386df681d951e3afc06bf1c7cf8 (patch) | |
| tree | a348010cf1ac174e431af125b5d784c4d18e7667 /drivers/net/xen-netfront.c | |
| parent | Merge tag 'timers-urgent-2023-01-12' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | xen/pvcalls: free active map buffer on pvcalls_front_free_map (diff) | |
| download | kernel-bad8c4a850eaf386df681d951e3afc06bf1c7cf8.tar.gz kernel-bad8c4a850eaf386df681d951e3afc06bf1c7cf8.zip | |
Merge tag 'for-linus-6.2-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
- two cleanup patches
- a fix of a memory leak in the Xen pvfront driver
- a fix of a locking issue in the Xen hypervisor console driver
* tag 'for-linus-6.2-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/pvcalls: free active map buffer on pvcalls_front_free_map
hvc/xen: lock console list traversal
x86/xen: Remove the unused function p2m_index()
xen: make remove callback of xen driver void returned
Diffstat (limited to 'drivers/net/xen-netfront.c')
| -rw-r--r-- | drivers/net/xen-netfront.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 14aec417fa06..12b074286df9 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -2646,7 +2646,7 @@ static void xennet_bus_close(struct xenbus_device *dev) } while (!ret); } -static int xennet_remove(struct xenbus_device *dev) +static void xennet_remove(struct xenbus_device *dev) { struct netfront_info *info = dev_get_drvdata(&dev->dev); @@ -2662,8 +2662,6 @@ static int xennet_remove(struct xenbus_device *dev) rtnl_unlock(); } xennet_free_netdev(info->netdev); - - return 0; } static const struct xenbus_device_id netfront_ids[] = { |