summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@redhat.com>2012-03-29 11:24:43 +0400
committerAmit Shah <amit.shah@redhat.com>2012-03-31 06:39:51 +0400
commit0517fdd156c46c23501451158c6b0ff9fb7236d1 (patch)
tree8699ac4ba7b4d6dbe01e187293db6c53d0eddb33
parentf38f8387cbdc4138a492ce9f2a5f04fd3cd3cf33 (diff)
downloadlinux-0517fdd156c46c23501451158c6b0ff9fb7236d1.tar.xz
virtio-pci: drop restore_common()
restore_common() was shared between restore and thaw callbacks. With thaw gone, we don't need restore_common() anymore. Signed-off-by: Amit Shah <amit.shah@redhat.com>
-rw-r--r--drivers/virtio/virtio_pci.c23
1 files changed, 7 insertions, 16 deletions
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index a35a402dfd78..982d6c9a2bf0 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -758,33 +758,24 @@ static int virtio_pci_freeze(struct device *dev)
return ret;
}
-static int restore_common(struct device *dev)
+static int virtio_pci_restore(struct device *dev)
{
struct pci_dev *pci_dev = to_pci_dev(dev);
struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev);
+ struct virtio_driver *drv;
int ret;
+ drv = container_of(vp_dev->vdev.dev.driver,
+ struct virtio_driver, driver);
+
ret = pci_enable_device(pci_dev);
if (ret)
return ret;
+
pci_set_master(pci_dev);
vp_finalize_features(&vp_dev->vdev);
- return ret;
-}
-
-static int virtio_pci_restore(struct device *dev)
-{
- struct pci_dev *pci_dev = to_pci_dev(dev);
- struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev);
- struct virtio_driver *drv;
- int ret;
-
- drv = container_of(vp_dev->vdev.dev.driver,
- struct virtio_driver, driver);
-
- ret = restore_common(dev);
- if (!ret && drv && drv->restore)
+ if (drv && drv->restore)
ret = drv->restore(&vp_dev->vdev);
/* Finally, tell the device we're all set */