diff options
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/arkfb.c | 3 | ||||
| -rw-r--r-- | drivers/video/fbdev/mmp/fb/mmpfb.c | 3 | ||||
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/dss/manager.c | 3 | ||||
| -rw-r--r-- | drivers/video/fbdev/smscufx.c | 3 | ||||
| -rw-r--r-- | drivers/video/fbdev/udlfb.c | 3 | ||||
| -rw-r--r-- | drivers/video/fbdev/uvesafb.c | 3 |
6 files changed, 6 insertions, 12 deletions
diff --git a/drivers/video/fbdev/arkfb.c b/drivers/video/fbdev/arkfb.c index 990e8038ffb3..866c1165704e 100644 --- a/drivers/video/fbdev/arkfb.c +++ b/drivers/video/fbdev/arkfb.c @@ -431,8 +431,7 @@ static struct dac_ops ics5342_ops = { static struct dac_info * ics5342_init(dac_read_regs_t drr, dac_write_regs_t dwr, void *data) { - struct ics5342_info *ics_info = kzalloc_obj(struct ics5342_info, - GFP_KERNEL); + struct ics5342_info *ics_info = kzalloc_obj(struct ics5342_info); struct dac_info *info = &ics_info->dac; if (!ics_info) diff --git a/drivers/video/fbdev/mmp/fb/mmpfb.c b/drivers/video/fbdev/mmp/fb/mmpfb.c index 18cef14e6d4c..694587256e06 100644 --- a/drivers/video/fbdev/mmp/fb/mmpfb.c +++ b/drivers/video/fbdev/mmp/fb/mmpfb.c @@ -476,8 +476,7 @@ static int modes_setup(struct mmpfb_info *fbi) return 0; } /* put videomode list to info structure */ - videomodes = kzalloc_objs(struct fb_videomode, videomode_num, - GFP_KERNEL); + videomodes = kzalloc_objs(struct fb_videomode, videomode_num); if (!videomodes) return -ENOMEM; diff --git a/drivers/video/fbdev/omap2/omapfb/dss/manager.c b/drivers/video/fbdev/omap2/omapfb/dss/manager.c index 0fc5d43c58ff..c81fe5e68e42 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/manager.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/manager.c @@ -32,8 +32,7 @@ int dss_init_overlay_managers(void) num_managers = dss_feat_get_num_mgrs(); - managers = kzalloc_objs(struct omap_overlay_manager, num_managers, - GFP_KERNEL); + managers = kzalloc_objs(struct omap_overlay_manager, num_managers); BUG_ON(managers == NULL); diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c index fa0d105841b3..5704f60e1741 100644 --- a/drivers/video/fbdev/smscufx.c +++ b/drivers/video/fbdev/smscufx.c @@ -946,8 +946,7 @@ static int ufx_ops_ioctl(struct fb_info *info, unsigned int cmd, /* TODO: Help propose a standard fb.h ioctl to report mmap damage */ if (cmd == UFX_IOCTL_REPORT_DAMAGE) { - struct dloarea *area __free(kfree) = kmalloc_obj(*area, - GFP_KERNEL); + struct dloarea *area __free(kfree) = kmalloc_obj(*area); if (!area) return -ENOMEM; diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c index db14827aebdd..3c6a9b5758d9 100644 --- a/drivers/video/fbdev/udlfb.c +++ b/drivers/video/fbdev/udlfb.c @@ -1164,8 +1164,7 @@ static const struct fb_ops dlfb_ops = { static void dlfb_deferred_vfree(struct dlfb_data *dlfb, void *mem) { - struct dlfb_deferred_free *d = kmalloc_obj(struct dlfb_deferred_free, - GFP_KERNEL); + struct dlfb_deferred_free *d = kmalloc_obj(struct dlfb_deferred_free); if (!d) return; d->mem = mem; diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c index 610a355dcb05..88667fccc27b 100644 --- a/drivers/video/fbdev/uvesafb.c +++ b/drivers/video/fbdev/uvesafb.c @@ -487,8 +487,7 @@ static int uvesafb_vbe_getmodes(struct uvesafb_ktask *task, mode++; } - par->vbe_modes = kzalloc_objs(struct vbe_mode_ib, par->vbe_modes_cnt, - GFP_KERNEL); + par->vbe_modes = kzalloc_objs(struct vbe_mode_ib, par->vbe_modes_cnt); if (!par->vbe_modes) return -ENOMEM; |