Skip to content

Commit

Permalink
virtio_pci: device-specific release callback
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael S. Tsirkin committed Jan 6, 2015
1 parent 80e9541 commit 945399a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
9 changes: 0 additions & 9 deletions drivers/virtio/virtio_pci_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -422,15 +422,6 @@ int vp_set_vq_affinity(struct virtqueue *vq, int cpu)
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
static int virtio_pci_freeze(struct device *dev)
{
Expand Down
1 change: 0 additions & 1 deletion drivers/virtio/virtio_pci_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ const char *vp_bus_name(struct virtio_device *vdev);
* - ignore the affinity request if we're using INTX
*/
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,
const struct pci_device_id *id);
Expand Down
9 changes: 9 additions & 0 deletions drivers/virtio/virtio_pci_legacy.c
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,15 @@ static const struct virtio_config_ops virtio_pci_config_ops = {
.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 */
int virtio_pci_legacy_probe(struct pci_dev *pci_dev,
const struct pci_device_id *id)
Expand Down

0 comments on commit 945399a

Please sign in to comment.