Signed-off-by: Joe Perches <joe at perches.com> --- 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 = vmalloc(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 c77bcc6..a941e6f 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 63ed3b7..c0c358c 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 428d273..81fcaea 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; -- 1.7.3.1.g432b3.dirty
On Fri, Nov 5, 2010 at 11:08 AM, Joe Perches <joe at perches.com> wrote:> Signed-off-by: Joe Perches <joe at perches.com> > --- > ?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 = vmalloc(videomemorysize);typo?> + ? ? ? 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 c77bcc6..a941e6f 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 63ed3b7..c0c358c 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 428d273..81fcaea 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; > > -- > 1.7.3.1.g432b3.dirty > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at ?http://vger.kernel.org/majordomo-info.html > Please read the FAQ at ?http://www.tux.org/lkml/ >-- Regards dave
On Fri, 2010-11-05 at 13:27 +0800, Dave Young wrote:> On Fri, Nov 5, 2010 at 11:08 AM, Joe Perches <joe at perches.com> wrote: > > diff --git 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 = vmalloc(videomemorysize); > typo?Yes. Thanks for catching that.
On Thu, Nov 04, 2010 at 08:08:00PM -0700, Joe Perches wrote:> Signed-off-by: Joe Perches <joe at perches.com>Looks good on xen-fb.> --- > 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 = vmalloc(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 c77bcc6..a941e6f 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 63ed3b7..c0c358c 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 428d273..81fcaea 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; > > -- > 1.7.3.1.g432b3.dirty
Apparently Analagous Threads
- [PATCH 36/49] drivers/video: Use vzalloc
- [TRIVIAL PATCH next 00/15] treewide: Convert vmalloc/memset to vzalloc
- [TRIVIAL PATCH next 00/15] treewide: Convert vmalloc/memset to vzalloc
- [TRIVIAL PATCH next 00/15] treewide: Convert vmalloc/memset to vzalloc
- [PATCH V2 36/49] drivers/video: Use vzalloc