virtio: blk: Move vq initialization to separate function

The probe and PM restore functions will share this code.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

1 files changed, 14 insertions, 5 deletions

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index ba73661fb9f3..e8af52355bf5 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -362,6 +362,18 @@ static void virtblk_config_changed(struct virtio_device *vdev)
         queue_work(virtblk_wq, &vblk->config_work);
 }
 
+static int init_vq(struct virtio_blk *vblk)
+{
+        int err = 0;
+
+        /* We expect one virtqueue, for output. */
+        vblk->vq = virtio_find_single_vq(vblk->vdev, blk_done, "requests");
+        if (IS_ERR(vblk->vq))
+                err = PTR_ERR(vblk->vq);
+
+        return err;
+}
+
 static int __devinit virtblk_probe(struct virtio_device *vdev)
 {
         struct virtio_blk *vblk;
@@ -405,12 +417,9 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)
         INIT_WORK(&vblk->config_work, virtblk_config_changed_work);
         vblk->config_enable = true;
 
-        /* We expect one virtqueue, for output. */
-        vblk->vq = virtio_find_single_vq(vdev, blk_done, "requests");
-        if (IS_ERR(vblk->vq)) {
-                err = PTR_ERR(vblk->vq);
+        err = init_vq(vblk);
+        if (err)
                 goto out_free_vblk;
-        }
 
         vblk->pool = mempool_create_kmalloc_pool(1,sizeof(struct virtblk_req));
         if (!vblk->pool) {