VFIO fixes for v5.15-rc4

- Fix vfio-ap leak on uninit (Jason Gunthorpe)
 
  - Add missing prototype arg name (Colin Ian King)
 -----BEGIN PGP SIGNATURE-----
 
 iQJPBAABCAA5FiEEQvbATlQL0amee4qQI5ubbjuwiyIFAmFTMOgbHGFsZXgud2ls
 bGlhbXNvbkByZWRoYXQuY29tAAoJECObm247sIsiyLsQAKN6+a5iMbJSBbjW1KWc
 ADM+1N4DeutGM8sVnTzT92yTLlCcBfYDbGNy0V9Gz8giJ8mqobCvj/kVsWx80MG6
 BKVkJn31G6BvqpfdHXXK1SRWJb8ywAeoC5dPSH/6h5nCBiqHTVwNyS6wvKEAIoVR
 1l4T/KEEzkr5zF1aIQFYnU4enNCq9TA4r3CW2cixbwYFFxnShUw/i5QrEYnKge2g
 n68kAka+1JcQIG7zkZyjAXv2vBBe+MhzjkWtG5JavpvPQdMjB4jnXW/0oRli9jaZ
 iDfVSgSCLTEy0bKY/4+UYoK2m3HmZEif+Ue9BvXLn9gmqdmes2Ax8IMzpNJNrxEQ
 s8CZunr4XMC4RirjqNsj2JXaAdMcPZNsRDyKXYKQe4FuUfcHL1TYjzfdmL5/LnRM
 lTN+APZFEQyNCh8HSC6VIfksm5GLpYaO7h3kb3bctUjjPVpL0bM697Yn75HjV9Jb
 Hw+PtHZt8mowC+g9tIMe4XvQ6xnzGyBaN2JSab9SpyNo3gXEIAKnvsEiTvbPrUdB
 cjZUeGqgb26n6AglSVlSgUcU/Tp90n7X3/+cmK9JdLEakE5E1TX0RN2EVi1BMWEc
 lg8l275KEDhLMpdvDTgtHayLnfOf00L6MKEO14UMAYKLza1qO4u7vh4uAGPSbPlK
 Fn9VgTPcq+US96bypcMjFnV1
 =IYLZ
 -----END PGP SIGNATURE-----

Merge tag 'vfio-v5.15-rc4' of git://github.com/awilliam/linux-vfio

Pull VFIO fixes from Alex Williamson:

 - Fix vfio-ap leak on uninit (Jason Gunthorpe)

 - Add missing prototype arg name (Colin Ian King)

* tag 'vfio-v5.15-rc4' of git://github.com/awilliam/linux-vfio:
  vfio/ap_ops: Add missed vfio_uninit_group_dev()
  vfio/pci: add missing identifier name in argument of function prototype

drivers/s390/crypto/vfio_ap_ops.c

@@ -361,6 +361,7 @@ err_list:
 	mutex_lock(&matrix_dev->lock);
 	list_del(&matrix_mdev->node);
 	mutex_unlock(&matrix_dev->lock);
+	vfio_uninit_group_dev(&matrix_mdev->vdev);
 	kfree(matrix_mdev);
 err_dec_available:
 	atomic_inc(&matrix_dev->available_instances);
@@ -376,9 +377,10 @@ static void vfio_ap_mdev_remove(struct mdev_device *mdev)
 	mutex_lock(&matrix_dev->lock);
 	vfio_ap_mdev_reset_queues(matrix_mdev);
 	list_del(&matrix_mdev->node);
+	mutex_unlock(&matrix_dev->lock);
+	vfio_uninit_group_dev(&matrix_mdev->vdev);
 	kfree(matrix_mdev);
 	atomic_inc(&matrix_dev->available_instances);
-	mutex_unlock(&matrix_dev->lock);
 }
 
 static ssize_t name_show(struct mdev_type *mtype,

drivers/vfio/pci/vfio_pci_core.c

@@ -565,7 +565,7 @@ static bool vfio_pci_dev_below_slot(struct pci_dev *pdev, struct pci_slot *slot)
 }
 
 struct vfio_pci_walk_info {
-	int (*fn)(struct pci_dev *, void *data);
+	int (*fn)(struct pci_dev *pdev, void *data);
 	void *data;
 	struct pci_dev *pdev;
 	bool slot;