Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 945399a8 authored Jan 04, 2015 by Michael S. Tsirkin

virtio_pci: device-specific release callback



It turns out we need to add device-specific code
in release callback. Move it to virtio_pci_legacy.c.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

parent 80e9541f

drivers/virtio/virtio_pci_common.c

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -422,15 +422,6 @@ int vp_set_vq_affinity(struct virtqueue *vq, int cpu)
	return 0;		return 0;
	}		}

	void virtio_pci_release_dev(struct device *_d)
	{
	/*
	* No need for a release method as we allocate/free
	* all devices together with the pci devices.
	* Provide an empty one to avoid getting a warning from core.
	*/
	}

	#ifdef CONFIG_PM_SLEEP		#ifdef CONFIG_PM_SLEEP
	static int virtio_pci_freeze(struct device *dev)		static int virtio_pci_freeze(struct device *dev)
	{		{

drivers/virtio/virtio_pci_common.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -126,7 +126,6 @@ const char vp_bus_name(struct virtio_device vdev);
	* - ignore the affinity request if we're using INTX		* - ignore the affinity request if we're using INTX
	*/		*/
	int vp_set_vq_affinity(struct virtqueue *vq, int cpu);		int vp_set_vq_affinity(struct virtqueue *vq, int cpu);
	void virtio_pci_release_dev(struct device *);

	int virtio_pci_legacy_probe(struct pci_dev *pci_dev,		int virtio_pci_legacy_probe(struct pci_dev *pci_dev,
	const struct pci_device_id *id);		const struct pci_device_id *id);

drivers/virtio/virtio_pci_legacy.c

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -211,6 +211,15 @@ static const struct virtio_config_ops virtio_pci_config_ops = {
	.set_vq_affinity = vp_set_vq_affinity,		.set_vq_affinity = vp_set_vq_affinity,
	};		};

			static void virtio_pci_release_dev(struct device *_d)
			{
			/*
			* No need for a release method as we allocate/free
			* all devices together with the pci devices.
			* Provide an empty one to avoid getting a warning from core.
			*/
			}

	/* the PCI probing function */		/* the PCI probing function */
	int virtio_pci_legacy_probe(struct pci_dev *pci_dev,		int virtio_pci_legacy_probe(struct pci_dev *pci_dev,
	const struct pci_device_id *id)		const struct pci_device_id *id)