lkml.org 
[lkml]   [2011]   [Dec]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 05/11] virtio: blk: Move vq initialization to separate function
    Date
    The probe and PM restore functions will share this code.

    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    ---
    drivers/block/virtio_blk.c | 19 ++++++++++++++-----
    1 files changed, 14 insertions(+), 5 deletions(-)

    diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
    index 34633f3..86c9c5b 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) {
    --
    1.7.7.4


    \
     
     \ /
      Last update: 2011-12-22 12:33    [W:0.022 / U:0.232 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site