Commit 7bc21c5e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-v6.12-rc1' of https://github.com/awilliam/linux-vfio 

Pull VFIO updates from Alex Williamson:
 "Just a few cleanups this cycle:

   - Remove several unused structure and function declarations, and
     unused variables (Dr. David Alan Gilbert, Yue Haibing, Zhang Zekun)

   - Constify unmodified structure in mdev (Hongbo Li)

   - Convert to unsigned type to catch overflow with less fanfare than
     passing a negative value to kcalloc() (Dan Carpenter)"

* tag 'vfio-v6.12-rc1' of https://github.com/awilliam/linux-vfio:
  vfio/pci: clean up a type in vfio_pci_ioctl_pci_hot_reset_groups()
  vfio/mdev: Constify struct kobj_type
  vfio: mdev: Remove unused function declarations
  vfio/fsl-mc: Remove unused variable 'hwirq'
  vfio/pci: Remove unused struct 'vfio_pci_mmap_vma'
parents 4491b854 aab439ff

drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c

+1 −3
Original line number Diff line number Diff line
@@ -108,10 +108,10 @@ static int vfio_fsl_mc_set_irq_trigger(struct vfio_fsl_mc_device *vdev, 
				       void *data)

{

	struct fsl_mc_device *mc_dev = vdev->mc_dev;

	int ret, hwirq;

	struct vfio_fsl_mc_irq *irq;

	struct device *cont_dev = fsl_mc_cont_dev(&mc_dev->dev);

	struct fsl_mc_device *mc_cont = to_fsl_mc_device(cont_dev);

	int ret;



	if (!count && (flags & VFIO_IRQ_SET_DATA_NONE))

		return vfio_set_trigger(vdev, index, -1);
@@ -136,8 +136,6 @@ static int vfio_fsl_mc_set_irq_trigger(struct vfio_fsl_mc_device *vdev, 
		return vfio_set_trigger(vdev, index, fd);

	}



	hwirq = vdev->mc_dev->irqs[index]->virq;



	irq = &vdev->mc_irqs[index];



	if (flags & VFIO_IRQ_SET_DATA_NONE) {

drivers/vfio/mdev/mdev_private.h

+0 −3
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ 
#ifndef MDEV_PRIVATE_H

#define MDEV_PRIVATE_H



int  mdev_bus_register(void);

void mdev_bus_unregister(void);



extern const struct bus_type mdev_bus_type;

extern const struct attribute_group *mdev_device_groups[];

drivers/vfio/mdev/mdev_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static void mdev_type_release(struct kobject *kobj) 
	put_device(type->parent->dev);

}



static struct kobj_type mdev_type_ktype = {

static const struct kobj_type mdev_type_ktype = {

	.sysfs_ops	= &mdev_type_sysfs_ops,

	.release	= mdev_type_release,

	.default_groups	= mdev_type_groups,

drivers/vfio/pci/vfio_pci_core.c

+1 −6
Original line number Diff line number Diff line
@@ -58,11 +58,6 @@ struct vfio_pci_vf_token { 
	int			users;

};



struct vfio_pci_mmap_vma {

	struct vm_area_struct	*vma;

	struct list_head	vma_next;

};



static inline bool vfio_vga_disabled(void)

{

#ifdef CONFIG_VFIO_PCI_VGA
@@ -1329,7 +1324,7 @@ static int vfio_pci_ioctl_get_pci_hot_reset_info( 


static int

vfio_pci_ioctl_pci_hot_reset_groups(struct vfio_pci_core_device *vdev,

				    int array_count, bool slot,

				    u32 array_count, bool slot,

				    struct vfio_pci_hot_reset __user *arg)

{

	int32_t *group_fds;