lkml.org 
[lkml]   [2011]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 042/206] Staging: hv: Get rid of the forwrd declaration of destroy_bounce_buffer
    Date
    Get rid of the forward declaration by moving the code around.

    Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
    Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
    Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
    Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
    ---
    drivers/staging/hv/storvsc_drv.c | 32 +++++++++++++++-----------------
    1 files changed, 15 insertions(+), 17 deletions(-)

    diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
    index 4196d6a..bf5b138 100644
    --- a/drivers/staging/hv/storvsc_drv.c
    +++ b/drivers/staging/hv/storvsc_drv.c
    @@ -148,6 +148,21 @@ static int storvsc_device_configure(struct scsi_device *sdevice)
    return 0;
    }

    +static void destroy_bounce_buffer(struct scatterlist *sgl,
    + unsigned int sg_count)
    +{
    + int i;
    + struct page *page_buf;
    +
    + for (i = 0; i < sg_count; i++) {
    + page_buf = sg_page((&sgl[i]));
    + if (page_buf != NULL)
    + __free_page(page_buf);
    + }
    +
    + kfree(sgl);
    +}
    +
    /* Static decl */
    static int storvsc_probe(struct hv_device *dev);
    static int storvsc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd);
    @@ -157,8 +172,6 @@ static int storvsc_remove(struct hv_device *dev);
    static struct scatterlist *create_bounce_buffer(struct scatterlist *sgl,
    unsigned int sg_count,
    unsigned int len);
    -static void destroy_bounce_buffer(struct scatterlist *sgl,
    - unsigned int sg_count);
    static int do_bounce_buffer(struct scatterlist *sgl, unsigned int sg_count);
    static unsigned int copy_from_bounce_buffer(struct scatterlist *orig_sgl,
    struct scatterlist *bounce_sgl,
    @@ -542,21 +555,6 @@ cleanup:
    return NULL;
    }

    -static void destroy_bounce_buffer(struct scatterlist *sgl,
    - unsigned int sg_count)
    -{
    - int i;
    - struct page *page_buf;
    -
    - for (i = 0; i < sg_count; i++) {
    - page_buf = sg_page((&sgl[i]));
    - if (page_buf != NULL)
    - __free_page(page_buf);
    - }
    -
    - kfree(sgl);
    -}
    -
    /* Assume the bounce_sgl has enough room ie using the create_bounce_buffer() */
    static unsigned int copy_to_bounce_buffer(struct scatterlist *orig_sgl,
    struct scatterlist *bounce_sgl,
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-05-10 00:09    [W:2.166 / U:0.752 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site