lkml.org 
[lkml]   [2011]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[TRIVIAL PATCH V2 next 12/15] video: Convert vmalloc/memset to vzalloc
    From
    Date
    Signed-off-by: Joe Perches <joe@perches.com>
    ---
    Heiko Stübner <heiko@sntech.de> pointed out I can't type...
    s/vmalloc/vmalloc/ doesn't do much.

    drivers/video/arcfb.c | 5 ++---
    drivers/video/broadsheetfb.c | 4 +---
    drivers/video/hecubafb.c | 5 ++---
    drivers/video/metronomefb.c | 4 +---
    drivers/video/xen-fbfront.c | 3 +--
    5 files changed, 7 insertions(+), 14 deletions(-)

    diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
    index 3ec4923..86573e2 100644
    --- a/drivers/video/arcfb.c
    +++ b/drivers/video/arcfb.c
    @@ -515,11 +515,10 @@ static int __devinit arcfb_probe(struct platform_device *dev)

    /* We need a flat backing store for the Arc's
    less-flat actual paged framebuffer */
    - if (!(videomemory = vmalloc(videomemorysize)))
    + videomemory = vzalloc(videomemorysize);
    + if (!videomemory)
    return retval;

    - memset(videomemory, 0, videomemorysize);
    -
    info = framebuffer_alloc(sizeof(struct arcfb_par), &dev->dev);
    if (!info)
    goto err;
    diff --git a/drivers/video/broadsheetfb.c b/drivers/video/broadsheetfb.c
    index ebda687..377dde3 100644
    --- a/drivers/video/broadsheetfb.c
    +++ b/drivers/video/broadsheetfb.c
    @@ -1101,12 +1101,10 @@ static int __devinit broadsheetfb_probe(struct platform_device *dev)

    videomemorysize = roundup((dpyw*dpyh), PAGE_SIZE);

    - videomemory = vmalloc(videomemorysize);
    + videomemory = vzalloc(videomemorysize);
    if (!videomemory)
    goto err_fb_rel;

    - memset(videomemory, 0, videomemorysize);
    -
    info->screen_base = (char *)videomemory;
    info->fbops = &broadsheetfb_ops;

    diff --git a/drivers/video/hecubafb.c b/drivers/video/hecubafb.c
    index 1b94643..fbef15f 100644
    --- a/drivers/video/hecubafb.c
    +++ b/drivers/video/hecubafb.c
    @@ -231,11 +231,10 @@ static int __devinit hecubafb_probe(struct platform_device *dev)

    videomemorysize = (DPY_W*DPY_H)/8;

    - if (!(videomemory = vmalloc(videomemorysize)))
    + videomemory = vzalloc(videomemorysize);
    + if (!videomemory)
    return retval;

    - memset(videomemory, 0, videomemorysize);
    -
    info = framebuffer_alloc(sizeof(struct hecubafb_par), &dev->dev);
    if (!info)
    goto err_fballoc;
    diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c
    index ed64edf..97d45e5 100644
    --- a/drivers/video/metronomefb.c
    +++ b/drivers/video/metronomefb.c
    @@ -628,12 +628,10 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
    /* we need to add a spare page because our csum caching scheme walks
    * to the end of the page */
    videomemorysize = PAGE_SIZE + (fw * fh);
    - videomemory = vmalloc(videomemorysize);
    + videomemory = vzalloc(videomemorysize);
    if (!videomemory)
    goto err_fb_rel;

    - memset(videomemory, 0, videomemorysize);
    -
    info->screen_base = (char __force __iomem *)videomemory;
    info->fbops = &metronomefb_ops;

    diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
    index a20218c..beac52f 100644
    --- a/drivers/video/xen-fbfront.c
    +++ b/drivers/video/xen-fbfront.c
    @@ -395,10 +395,9 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
    spin_lock_init(&info->dirty_lock);
    spin_lock_init(&info->resize_lock);

    - info->fb = vmalloc(fb_size);
    + info->fb = vzalloc(fb_size);
    if (info->fb == NULL)
    goto error_nomem;
    - memset(info->fb, 0, fb_size);

    info->nr_pages = (fb_size + PAGE_SIZE - 1) >> PAGE_SHIFT;

    --

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2011-05-28 20:15    [W:0.042 / U:29.544 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site