diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-13 00:02:20 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-13 00:02:20 +0100 |
| commit | bad8c4a850eaf386df681d951e3afc06bf1c7cf8 (patch) | |
| tree | a348010cf1ac174e431af125b5d784c4d18e7667 /drivers/pci | |
| 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 | linux-bad8c4a850eaf386df681d951e3afc06bf1c7cf8.tar.xz linux-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/pci')
| -rw-r--r-- | drivers/pci/xen-pcifront.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index 7378e2f3e525..fcd029ca2eb1 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c @@ -1055,14 +1055,12 @@ out: return err; } -static int pcifront_xenbus_remove(struct xenbus_device *xdev) +static void pcifront_xenbus_remove(struct xenbus_device *xdev) { struct pcifront_device *pdev = dev_get_drvdata(&xdev->dev); if (pdev) free_pdev(pdev); - - return 0; } static const struct xenbus_device_id xenpci_ids[] = { |