Convert 'alloc_obj' family to use the new default GFP_KERNEL argument

This was done entirely with mindless brute force, using

    git grep -l '\<k[vmz]*alloc_objs*(.*, GFP_KERNEL)' |
        xargs sed -i 's/\(alloc_objs*(.*\), GFP_KERNEL)/\1)/'

to convert the new alloc_obj() users that had a simple GFP_KERNEL
argument to just drop that argument.

Note that due to the extreme simplicity of the scripting, any slightly
more complex cases spread over multiple lines would not be triggered:
they definitely exist, but this covers the vast bulk of the cases, and
the resulting diff is also then easier to check automatically.

For the same reason the 'flex' versions will be done as a separate
conversion.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

36 files changed, 53 insertions, 53 deletions

diff --git a/drivers/video/fbdev/aty/radeon_backlight.c b/drivers/video/fbdev/aty/radeon_backlight.c
index 908b2be850ac..32d7f32db46a 100644
--- a/drivers/video/fbdev/aty/radeon_backlight.c
+++ b/drivers/video/fbdev/aty/radeon_backlight.c
@@ -136,7 +136,7 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)
 		return;
 #endif
 
-	pdata = kmalloc_obj(struct radeon_bl_privdata, GFP_KERNEL);
+	pdata = kmalloc_obj(struct radeon_bl_privdata);
 	if (!pdata) {
 		printk("radeonfb: Memory allocation failed\n");
 		goto error;
diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c
index 979e8eb6cda4..cb006484831b 100644
--- a/drivers/video/fbdev/aty/radeon_base.c
+++ b/drivers/video/fbdev/aty/radeon_base.c
@@ -1653,7 +1653,7 @@ static int radeonfb_set_par(struct fb_info *info)
 	int depth = var_to_depth(mode);
 	int use_rmx = 0;
 
-	newmode = kmalloc_obj(struct radeon_regs, GFP_KERNEL);
+	newmode = kmalloc_obj(struct radeon_regs);
 	if (!newmode)
 		return -ENOMEM;
 
diff --git a/drivers/video/fbdev/carminefb.c b/drivers/video/fbdev/carminefb.c
index 82836c327f05..bd4bff6a2484 100644
--- a/drivers/video/fbdev/carminefb.c
+++ b/drivers/video/fbdev/carminefb.c
@@ -620,7 +620,7 @@ static int carminefb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
 		return ret;
 
 	ret = -ENOMEM;
-	hw = kzalloc_obj(*hw, GFP_KERNEL);
+	hw = kzalloc_obj(*hw);
 	if (!hw)
 		goto err_enable_pci;
 
diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c
index b589f46178a2..4bb821d7f284 100644
--- a/drivers/video/fbdev/controlfb.c
+++ b/drivers/video/fbdev/controlfb.c
@@ -944,7 +944,7 @@ static int __init control_of_init(struct device_node *dp)
 		printk(KERN_ERR "can't get 2 addresses for control\n");
 		return -ENXIO;
 	}
-	p = kzalloc_obj(*p, GFP_KERNEL);
+	p = kzalloc_obj(*p);
 	if (!p)
 		return -ENOMEM;
 	control_fb = p;	/* save it for cleanups */
diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
index 2b2604255b90..ca48b89a323d 100644
--- a/drivers/video/fbdev/core/fb_defio.c
+++ b/drivers/video/fbdev/core/fb_defio.c
@@ -307,7 +307,7 @@ int fb_deferred_io_init(struct fb_info *info)
 	npagerefs = DIV_ROUND_UP(info->fix.smem_len, PAGE_SIZE);
 
 	/* alloc a page ref for each page of the display memory */
-	pagerefs = kvzalloc_objs(*pagerefs, npagerefs, GFP_KERNEL);
+	pagerefs = kvzalloc_objs(*pagerefs, npagerefs);
 	if (!pagerefs) {
 		ret = -ENOMEM;
 		goto err;
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index 29ed5b152ac6..666261ae59d8 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -769,7 +769,7 @@ static int fbcon_open(struct fb_info *info)
 	}
 	unlock_fb_info(info);
 
-	par = kzalloc_obj(*par, GFP_KERNEL);
+	par = kzalloc_obj(*par);
 	if (!par) {
 		fbcon_release(info);
 		return -ENOMEM;
diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c
index 67ccb5607ded..f96b4e7b7f21 100644
--- a/drivers/video/fbdev/core/fbmon.c
+++ b/drivers/video/fbdev/core/fbmon.c
@@ -388,7 +388,7 @@ static void calc_mode_timings(int xres, int yres, int refresh,
 {
 	struct fb_var_screeninfo *var;
 
-	var = kzalloc_obj(struct fb_var_screeninfo, GFP_KERNEL);
+	var = kzalloc_obj(struct fb_var_screeninfo);
 
 	if (var) {
 		var->xres = xres;
@@ -626,7 +626,7 @@ static struct fb_videomode *fb_create_modedb(unsigned char *edid, int *dbsize,
 	int num = 0, i, first = 1;
 	int ver, rev;
 
-	mode = kzalloc_objs(struct fb_videomode, 50, GFP_KERNEL);
+	mode = kzalloc_objs(struct fb_videomode, 50);
 	if (mode == NULL)
 		return NULL;
 
@@ -677,7 +677,7 @@ static struct fb_videomode *fb_create_modedb(unsigned char *edid, int *dbsize,
 	}
 
 	*dbsize = num;
-	m = kmalloc_objs(struct fb_videomode, num, GFP_KERNEL);
+	m = kmalloc_objs(struct fb_videomode, num);
 	if (!m)
 		return mode;
 	memmove(m, mode, num * sizeof(struct fb_videomode));
@@ -1224,7 +1224,7 @@ int fb_get_mode(int flags, u32 val, struct fb_var_screeninfo *var, struct fb_inf
 	u32 hfmin, hfmax, vfmin, vfmax, dclkmin, dclkmax, err = 0;
 
 
-	timings = kzalloc_obj(struct __fb_timings, GFP_KERNEL);
+	timings = kzalloc_obj(struct __fb_timings);
 
 	if (!timings)
 		return -ENOMEM;
diff --git a/drivers/video/fbdev/core/modedb.c b/drivers/video/fbdev/core/modedb.c
index fda6066eec99..703d0b7aec32 100644
--- a/drivers/video/fbdev/core/modedb.c
+++ b/drivers/video/fbdev/core/modedb.c
@@ -1070,7 +1070,7 @@ int fb_add_videomode(const struct fb_videomode *mode, struct list_head *head)
 		}
 	}
 	if (!found) {
-		modelist = kmalloc_obj(struct fb_modelist, GFP_KERNEL);
+		modelist = kmalloc_obj(struct fb_modelist);
 
 		if (!modelist)
 			return -ENOMEM;
diff --git a/drivers/video/fbdev/cyber2000fb.c b/drivers/video/fbdev/cyber2000fb.c
index 172ca6bc2c05..2d12f8e96c7e 100644
--- a/drivers/video/fbdev/cyber2000fb.c
+++ b/drivers/video/fbdev/cyber2000fb.c
@@ -1363,7 +1363,7 @@ static struct cfb_info *cyberpro_alloc_fb_info(unsigned int id, char *name)
 {
 	struct cfb_info *cfb;
 
-	cfb = kzalloc_obj(struct cfb_info, GFP_KERNEL);
+	cfb = kzalloc_obj(struct cfb_info);
 	if (!cfb)
 		return NULL;
 
diff --git a/drivers/video/fbdev/goldfishfb.c b/drivers/video/fbdev/goldfishfb.c
index fcba50a6f65b..ffe33a36b944 100644
--- a/drivers/video/fbdev/goldfishfb.c
+++ b/drivers/video/fbdev/goldfishfb.c
@@ -180,7 +180,7 @@ static int goldfish_fb_probe(struct platform_device *pdev)
 	u32 width, height;
 	dma_addr_t fbpaddr;
 
-	fb = kzalloc_obj(*fb, GFP_KERNEL);
+	fb = kzalloc_obj(*fb);
 	if (fb == NULL) {
 		ret = -ENOMEM;
 		goto err_fb_alloc_failed;
diff --git a/drivers/video/fbdev/matrox/i2c-matroxfb.c b/drivers/video/fbdev/matrox/i2c-matroxfb.c
index 6741028d2d0c..e02dd11b090e 100644
--- a/drivers/video/fbdev/matrox/i2c-matroxfb.c
+++ b/drivers/video/fbdev/matrox/i2c-matroxfb.c
@@ -144,7 +144,7 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) {
 	unsigned long flags;
 	struct matroxfb_dh_maven_info* m2info;
 
-	m2info = kzalloc_obj(*m2info, GFP_KERNEL);
+	m2info = kzalloc_obj(*m2info);
 	if (!m2info)
 		return NULL;
 
diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
index e7d8e13d1945..e1a4bc7c2318 100644
--- a/drivers/video/fbdev/matrox/matroxfb_base.c
+++ b/drivers/video/fbdev/matrox/matroxfb_base.c
@@ -2073,7 +2073,7 @@ static int matroxfb_probe(struct pci_dev* pdev, const struct pci_device_id* dumm
 		return -1;
 	}
 
-	minfo = kzalloc_obj(*minfo, GFP_KERNEL);
+	minfo = kzalloc_obj(*minfo);
 	if (!minfo)
 		return -ENOMEM;
 
diff --git a/drivers/video/fbdev/matrox/matroxfb_crtc2.c b/drivers/video/fbdev/matrox/matroxfb_crtc2.c
index 6043ebb2bc96..8de882b09a24 100644
--- a/drivers/video/fbdev/matrox/matroxfb_crtc2.c
+++ b/drivers/video/fbdev/matrox/matroxfb_crtc2.c
@@ -693,7 +693,7 @@ static void* matroxfb_crtc2_probe(struct matrox_fb_info* minfo) {
 	/* hardware is CRTC2 incapable... */
 	if (!minfo->devflags.crtc2)
 		return NULL;
-	m2info = kzalloc_obj(*m2info, GFP_KERNEL);
+	m2info = kzalloc_obj(*m2info);
 	if (!m2info)
 		return NULL;
 
diff --git a/drivers/video/fbdev/matrox/matroxfb_maven.c b/drivers/video/fbdev/matrox/matroxfb_maven.c
index 63cc77ac74ea..2ea65da6075c 100644
--- a/drivers/video/fbdev/matrox/matroxfb_maven.c
+++ b/drivers/video/fbdev/matrox/matroxfb_maven.c
@@ -1260,7 +1260,7 @@ static int maven_probe(struct i2c_client *client)
 					      I2C_FUNC_NOSTART |
 					      I2C_FUNC_PROTOCOL_MANGLING))
 		goto ERROR0;
-	if (!(data = kzalloc_obj(*data, GFP_KERNEL))) {
+	if (!(data = kzalloc_obj(*data))) {
 		err = -ENOMEM;
 		goto ERROR0;
 	}
diff --git a/drivers/video/fbdev/mmp/hw/mmp_ctrl.c b/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
index 2cd152f7a4be..75bbdc0b4aa6 100644
--- a/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
+++ b/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
@@ -402,7 +402,7 @@ static int path_init(struct mmphw_path_plat *path_plat,
 	dev_info(ctrl->dev, "%s: %s\n", __func__, config->name);
 
 	/* init driver data */
-	path_info = kzalloc_obj(*path_info, GFP_KERNEL);
+	path_info = kzalloc_obj(*path_info);
 	if (!path_info)
 		return 0;
 
diff --git a/drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c b/drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c
index 40194c60987d..d111ec2a4703 100644
--- a/drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c
+++ b/drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c
@@ -144,7 +144,7 @@ static int tpohvga_probe(struct spi_device *spi)
 		return ret;
 	}
 
-	plat_data = kzalloc_obj(*plat_data, GFP_KERNEL);
+	plat_data = kzalloc_obj(*plat_data);
 	if (plat_data == NULL)
 		return -ENOMEM;
 
diff --git a/drivers/video/fbdev/neofb.c b/drivers/video/fbdev/neofb.c
index 7b7a2b2d1a40..c1cd028b8991 100644
--- a/drivers/video/fbdev/neofb.c
+++ b/drivers/video/fbdev/neofb.c
@@ -1768,7 +1768,7 @@ static int neo_scan_monitor(struct fb_info *info)
 	int w;
 
 	// Eventually we will have i2c support.
-	info->monspecs.modedb = kmalloc_obj(struct fb_videomode, GFP_KERNEL);
+	info->monspecs.modedb = kmalloc_obj(struct fb_videomode);
 	if (!info->monspecs.modedb)
 		return -ENOMEM;
 	info->monspecs.modedb_len = 1;
diff --git a/drivers/video/fbdev/nvidia/nv_setup.c b/drivers/video/fbdev/nvidia/nv_setup.c
index f392da4761da..281c7f2ee650 100644
--- a/drivers/video/fbdev/nvidia/nv_setup.c
+++ b/drivers/video/fbdev/nvidia/nv_setup.c
@@ -283,9 +283,9 @@ int NVCommonSetup(struct fb_info *info)
 	int Television = 0;
 	int err = 0;
 
-	var = kzalloc_obj(struct fb_var_screeninfo, GFP_KERNEL);
-	monitorA = kzalloc_obj(struct fb_monspecs, GFP_KERNEL);
-	monitorB = kzalloc_obj(struct fb_monspecs, GFP_KERNEL);
+	var = kzalloc_obj(struct fb_var_screeninfo);
+	monitorA = kzalloc_obj(struct fb_monspecs);
+	monitorB = kzalloc_obj(struct fb_monspecs);
 
 	if (!var || !monitorA || !monitorB) {
 		err = -ENOMEM;
diff --git a/drivers/video/fbdev/omap/lcd_mipid.c b/drivers/video/fbdev/omap/lcd_mipid.c
index ffe0ce489adb..72c2a56943c2 100644
--- a/drivers/video/fbdev/omap/lcd_mipid.c
+++ b/drivers/video/fbdev/omap/lcd_mipid.c
@@ -552,7 +552,7 @@ static int mipid_spi_probe(struct spi_device *spi)
 	struct mipid_device *md;
 	int r;
 
-	md = kzalloc_obj(*md, GFP_KERNEL);
+	md = kzalloc_obj(*md);
 	if (md == NULL) {
 		dev_err(&spi->dev, "out of memory\n");
 		return -ENOMEM;
diff --git a/drivers/video/fbdev/omap/omapfb_main.c b/drivers/video/fbdev/omap/omapfb_main.c
index 8306faf01f40..cafe859d6e5a 100644
--- a/drivers/video/fbdev/omap/omapfb_main.c
+++ b/drivers/video/fbdev/omap/omapfb_main.c
@@ -1630,7 +1630,7 @@ static int omapfb_do_probe(struct platform_device *pdev,
 		goto cleanup;
 	}
 
-	fbdev = kzalloc_obj(*fbdev, GFP_KERNEL);
+	fbdev = kzalloc_obj(*fbdev);
 	if (fbdev == NULL) {
 		dev_err(&pdev->dev,
 			"unable to allocate memory for device info\n");
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
index 19498b7ccb14..330d9fb7d2b0 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
@@ -1539,7 +1539,7 @@ static void dsi_dump_dsidev_irqs(struct platform_device *dsidev,
 	unsigned long flags;
 	struct dsi_irq_stats *stats;
 
-	stats = kzalloc_obj(*stats, GFP_KERNEL);
+	stats = kzalloc_obj(*stats);
 	if (!stats) {
 		seq_printf(s, "out of memory\n");
 		return;
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c b/drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c
index 098c02164428..154347e5ddaf 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c
@@ -46,7 +46,7 @@ static void __init omapdss_update_prop(struct device_node *node, char *compat,
 {
 	struct property *prop;
 
-	prop = kzalloc_obj(*prop, GFP_KERNEL);
+	prop = kzalloc_obj(*prop);
 	if (!prop)
 		return;
 
@@ -110,7 +110,7 @@ static void __init omapdss_omapify_node(struct device_node *node)
 
 static void __init omapdss_add_to_list(struct device_node *node, bool root)
 {
-	struct dss_conv_node *n = kmalloc_obj(struct dss_conv_node, GFP_KERNEL);
+	struct dss_conv_node *n = kmalloc_obj(struct dss_conv_node);
 	if (n) {
 		n->node = node;
 		n->root = root;
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/overlay.c b/drivers/video/fbdev/omap2/omapfb/dss/overlay.c
index cb2a230c57a1..6b04162aa9fc 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/overlay.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/overlay.c
@@ -49,7 +49,7 @@ void dss_init_overlays(struct platform_device *pdev)
 
 	num_overlays = dss_feat_get_num_ovls();
 
-	overlays = kzalloc_objs(struct omap_overlay, num_overlays, GFP_KERNEL);
+	overlays = kzalloc_objs(struct omap_overlay, num_overlays);
 
 	BUG_ON(overlays == NULL);
 
diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
index 599a7d6a6114..a8b2930290e1 100644
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
@@ -2023,19 +2023,19 @@ static int omapfb_mode_to_timings(const char *mode_str,
 	var = NULL;
 	fbops = NULL;
 
-	fbi = kzalloc_obj(*fbi, GFP_KERNEL);
+	fbi = kzalloc_obj(*fbi);
 	if (fbi == NULL) {
 		r = -ENOMEM;
 		goto err;
 	}
 
-	var = kzalloc_obj(*var, GFP_KERNEL);
+	var = kzalloc_obj(*var);
 	if (var == NULL) {
 		r = -ENOMEM;
 		goto err;
 	}
 
-	fbops = kzalloc_obj(*fbops, GFP_KERNEL);
+	fbops = kzalloc_obj(*fbops);
 	if (fbops == NULL) {
 		r = -ENOMEM;
 		goto err;
@@ -2244,7 +2244,7 @@ static int omapfb_find_best_mode(struct omap_dss_device *display,
 	if (r < 0)
 		goto err1;
 
-	specs = kzalloc_obj(*specs, GFP_KERNEL);
+	specs = kzalloc_obj(*specs);
 	if (specs == NULL) {
 		r = -ENOMEM;
 		goto err1;
diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c
index d47c173fd8e0..3f6384e631b1 100644
--- a/drivers/video/fbdev/pvr2fb.c
+++ b/drivers/video/fbdev/pvr2fb.c
@@ -652,7 +652,7 @@ static ssize_t pvr2fb_write(struct fb_info *info, const char *buf,
 
 	nr_pages = (count + PAGE_SIZE - 1) >> PAGE_SHIFT;
 
-	pages = kmalloc_objs(struct page *, nr_pages, GFP_KERNEL);
+	pages = kmalloc_objs(struct page *, nr_pages);
 	if (!pages)
 		return -ENOMEM;
 
diff --git a/drivers/video/fbdev/pxa3xx-gcu.c b/drivers/video/fbdev/pxa3xx-gcu.c
index c2aec9419ae9..a2320e2fb8f2 100644
--- a/drivers/video/fbdev/pxa3xx-gcu.c
+++ b/drivers/video/fbdev/pxa3xx-gcu.c
@@ -530,7 +530,7 @@ pxa3xx_gcu_add_buffer(struct device *dev,
 {
 	struct pxa3xx_gcu_batch *buffer;
 
-	buffer = kzalloc_obj(struct pxa3xx_gcu_batch, GFP_KERNEL);
+	buffer = kzalloc_obj(struct pxa3xx_gcu_batch);
 	if (!buffer)
 		return -ENOMEM;
 
diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
index c52391f9893b..72969fe8e513 100644
--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
@@ -2512,7 +2512,7 @@ static int sh_mobile_lcdc_probe(struct platform_device *pdev)
 		return -ENOENT;
 	}
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/video/fbdev/simplefb.c b/drivers/video/fbdev/simplefb.c
index 67f3f2df2064..60e5dcec201f 100644
--- a/drivers/video/fbdev/simplefb.c
+++ b/drivers/video/fbdev/simplefb.c
@@ -249,7 +249,7 @@ static int simplefb_clocks_get(struct simplefb_par *par,
 	if (!par->clk_count)
 		return 0;
 
-	par->clks = kzalloc_objs(struct clk *, par->clk_count, GFP_KERNEL);
+	par->clks = kzalloc_objs(struct clk *, par->clk_count);
 	if (!par->clks)
 		return -ENOMEM;
 
diff --git a/drivers/video/fbdev/sm501fb.c b/drivers/video/fbdev/sm501fb.c
index abc9bcfe579b..fee4b9f84592 100644
--- a/drivers/video/fbdev/sm501fb.c
+++ b/drivers/video/fbdev/sm501fb.c
@@ -1947,7 +1947,7 @@ static int sm501fb_probe(struct platform_device *pdev)
 	int ret;
 
 	/* allocate our framebuffers */
-	info = kzalloc_obj(*info, GFP_KERNEL);
+	info = kzalloc_obj(*info);
 	if (!info) {
 		dev_err(dev, "failed to allocate state\n");
 		return -ENOMEM;
diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
index ddc45d9a2ca2..fa0d105841b3 100644
--- a/drivers/video/fbdev/smscufx.c
+++ b/drivers/video/fbdev/smscufx.c
@@ -1038,7 +1038,7 @@ static int ufx_ops_open(struct fb_info *info, int user)
 
 		struct fb_deferred_io *fbdefio;
 
-		fbdefio = kzalloc_obj(*fbdefio, GFP_KERNEL);
+		fbdefio = kzalloc_obj(*fbdefio);
 		if (fbdefio) {
 			fbdefio->delay = UFX_DEFIO_WRITE_DELAY;
 			fbdefio->deferred_io = ufx_dpy_deferred_io;
@@ -1595,7 +1595,7 @@ static int ufx_usb_probe(struct usb_interface *interface,
 	usbdev = interface_to_usbdev(interface);
 	BUG_ON(!usbdev);
 
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (dev == NULL) {
 		dev_err(&usbdev->dev, "ufx_usb_probe: failed alloc of dev struct\n");
 		return -ENOMEM;
@@ -1852,7 +1852,7 @@ static int ufx_alloc_urb_list(struct ufx_data *dev, int count, size_t size)
 	INIT_LIST_HEAD(&dev->urbs.list);
 
 	while (i < count) {
-		unode = kzalloc_obj(*unode, GFP_KERNEL);
+		unode = kzalloc_obj(*unode);
 		if (!unode)
 			break;
 		unode->dev = dev;
diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
index ba060af2b09f..db14827aebdd 100644
--- a/drivers/video/fbdev/udlfb.c
+++ b/drivers/video/fbdev/udlfb.c
@@ -918,7 +918,7 @@ static int dlfb_ops_open(struct fb_info *info, int user)
 
 		struct fb_deferred_io *fbdefio;
 
-		fbdefio = kzalloc_obj(struct fb_deferred_io, GFP_KERNEL);
+		fbdefio = kzalloc_obj(struct fb_deferred_io);
 
 		if (fbdefio) {
 			fbdefio->delay = DL_DEFIO_WRITE_DELAY;
@@ -1607,7 +1607,7 @@ static int dlfb_usb_probe(struct usb_interface *intf,
 	static u8 out_ep[] = {OUT_EP_NUM + USB_DIR_OUT, 0};
 
 	/* usb initialization */
-	dlfb = kzalloc_obj(*dlfb, GFP_KERNEL);
+	dlfb = kzalloc_obj(*dlfb);
 	if (!dlfb) {
 		dev_err(&intf->dev, "%s: failed to allocate dlfb\n", __func__);
 		return -ENOMEM;
@@ -1853,7 +1853,7 @@ retry:
 	dlfb->urbs.available = 0;
 
 	while (dlfb->urbs.count * size < wanted_size) {
-		unode = kzalloc_obj(*unode, GFP_KERNEL);
+		unode = kzalloc_obj(*unode);
 		if (!unode)
 			break;
 		unode->dlfb = dlfb;
diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
index c9e299afc02b..610a355dcb05 100644
--- a/drivers/video/fbdev/uvesafb.c
+++ b/drivers/video/fbdev/uvesafb.c
@@ -258,9 +258,9 @@ static struct uvesafb_ktask *uvesafb_prep(void)
 {
 	struct uvesafb_ktask *task;
 
-	task = kzalloc_obj(*task, GFP_KERNEL);
+	task = kzalloc_obj(*task);
 	if (task) {
-		task->done = kzalloc_obj(*task->done, GFP_KERNEL);
+		task->done = kzalloc_obj(*task->done);
 		if (!task->done) {
 			kfree(task);
 			task = NULL;
@@ -861,7 +861,7 @@ static int uvesafb_vbe_init_mode(struct fb_info *info)
 	 * Convert the modelist into a modedb so that we can use it with
 	 * fb_find_mode().
 	 */
-	mode = kzalloc_objs(*mode, i, GFP_KERNEL);
+	mode = kzalloc_objs(*mode, i);
 	if (mode) {
 		i = 0;
 		list_for_each(pos, &info->modelist) {
@@ -1047,7 +1047,7 @@ static int uvesafb_setcmap(struct fb_cmap *cmap, struct fb_info *info)
 		    info->cmap.len || cmap->start < info->cmap.start)
 			return -EINVAL;
 
-		entries = kmalloc_objs(*entries, cmap->len, GFP_KERNEL);
+		entries = kmalloc_objs(*entries, cmap->len);
 		if (!entries)
 			return -ENOMEM;
 
@@ -1241,7 +1241,7 @@ setmode:
 	    info->var.pixclock != 0) {
 		task->t.regs.ebx |= 0x0800;		/* use CRTC data */
 		task->t.flags = TF_BUF_ESDI;
-		crtc = kzalloc_obj(struct vbe_crtc_ib, GFP_KERNEL);
+		crtc = kzalloc_obj(struct vbe_crtc_ib);
 		if (!crtc) {
 			err = -ENOMEM;
 			goto out;
diff --git a/drivers/video/fbdev/via/via_aux.c b/drivers/video/fbdev/via/via_aux.c
index 11f28a16e9b1..47f88a2c4524 100644
--- a/drivers/video/fbdev/via/via_aux.c
+++ b/drivers/video/fbdev/via/via_aux.c
@@ -17,7 +17,7 @@ struct via_aux_bus *via_aux_probe(struct i2c_adapter *adap)
 	if (!adap)
 		return NULL;
 
-	bus = kmalloc_obj(*bus, GFP_KERNEL);
+	bus = kmalloc_obj(*bus);
 	if (!bus)
 		return NULL;
 
diff --git a/drivers/video/fbdev/via/via_aux.h b/drivers/video/fbdev/via/via_aux.h
index cb28fb21b1c7..6453d6a4fb4e 100644
--- a/drivers/video/fbdev/via/via_aux.h
+++ b/drivers/video/fbdev/via/via_aux.h
@@ -42,7 +42,7 @@ const struct fb_videomode *via_aux_get_preferred_mode(struct via_aux_bus *bus);
 
 static inline bool via_aux_add(struct via_aux_drv *drv)
 {
-	struct via_aux_drv *data = kmalloc_obj(*data, GFP_KERNEL);
+	struct via_aux_drv *data = kmalloc_obj(*data);
 
 	if (!data)
 		return false;
diff --git a/drivers/video/fbdev/via/via_aux_edid.c b/drivers/video/fbdev/via/via_aux_edid.c
index 75c40aede6f2..c4abfb1bcf52 100644
--- a/drivers/video/fbdev/via/via_aux_edid.c
+++ b/drivers/video/fbdev/via/via_aux_edid.c
@@ -24,7 +24,7 @@ static void query_edid(struct via_aux_drv *drv)
 	if (spec) {
 		fb_destroy_modedb(spec->modedb);
 	} else {
-		spec = kmalloc_obj(*spec, GFP_KERNEL);
+		spec = kmalloc_obj(*spec);
 		if (!spec)
 			return;
 	}
diff --git a/drivers/video/fbdev/xen-fbfront.c b/drivers/video/fbdev/xen-fbfront.c
index a432b487bb76..4385976277ac 100644
--- a/drivers/video/fbdev/xen-fbfront.c
+++ b/drivers/video/fbdev/xen-fbfront.c
@@ -348,7 +348,7 @@ static int xenfb_probe(struct xenbus_device *dev,
 	int val;
 	int ret = 0;
 
-	info = kzalloc_obj(*info, GFP_KERNEL);
+	info = kzalloc_obj(*info);
 	if (info == NULL) {
 		xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure");
 		return -ENOMEM;