From cb11d569041d817a32bcf95b00e1af216821048f Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Thu, 29 Mar 2012 12:54:43 +0530 Subject: [PATCH] --- yaml --- r: 298385 b: refs/heads/master c: 0517fdd156c46c23501451158c6b0ff9fb7236d1 h: refs/heads/master i: 298383: 9392da18a7619b3ba81fcb7cb94f9bd6c8807ae7 v: v3 --- [refs] | 2 +- trunk/drivers/virtio/virtio_pci.c | 23 +++++++---------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 17e2e13d0cba..92254509c8de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f38f8387cbdc4138a492ce9f2a5f04fd3cd3cf33 +refs/heads/master: 0517fdd156c46c23501451158c6b0ff9fb7236d1 diff --git a/trunk/drivers/virtio/virtio_pci.c b/trunk/drivers/virtio/virtio_pci.c index a35a402dfd78..982d6c9a2bf0 100644 --- a/trunk/drivers/virtio/virtio_pci.c +++ b/trunk/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 */