Commit 6abd6e5a authored by Amit Shah's avatar Amit Shah Committed by Rusty Russell
Browse files

virtio: blk: Move vq initialization to separate function 



The probe and PM restore functions will share this code.

Signed-off-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent c743d09d

drivers/block/virtio_blk.c

+14 −5
Original line number Diff line number Diff line
@@ -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) {