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>

67 files changed, 137 insertions, 137 deletions

diff --git a/drivers/staging/greybus/authentication.c b/drivers/staging/greybus/authentication.c
index e52e3f043572..97b9937bbdc1 100644
--- a/drivers/staging/greybus/authentication.c
+++ b/drivers/staging/greybus/authentication.c
@@ -306,7 +306,7 @@ int gb_cap_connection_init(struct gb_connection *connection)
 	if (!connection)
 		return 0;
 
-	cap = kzalloc_obj(*cap, GFP_KERNEL);
+	cap = kzalloc_obj(*cap);
 	if (!cap)
 		return -ENOMEM;
 
diff --git a/drivers/staging/greybus/bootrom.c b/drivers/staging/greybus/bootrom.c
index bad4091e2433..83921d90c322 100644
--- a/drivers/staging/greybus/bootrom.c
+++ b/drivers/staging/greybus/bootrom.c
@@ -424,7 +424,7 @@ static int gb_bootrom_probe(struct gb_bundle *bundle,
 	if (cport_desc->protocol_id != GREYBUS_PROTOCOL_BOOTROM)
 		return -ENODEV;
 
-	bootrom = kzalloc_obj(*bootrom, GFP_KERNEL);
+	bootrom = kzalloc_obj(*bootrom);
 	if (!bootrom)
 		return -ENOMEM;
 
diff --git a/drivers/staging/greybus/camera.c b/drivers/staging/greybus/camera.c
index 8ad3785ff467..62b55bb28408 100644
--- a/drivers/staging/greybus/camera.c
+++ b/drivers/staging/greybus/camera.c
@@ -791,7 +791,7 @@ static int gb_camera_op_configure_streams(void *priv, unsigned int *nstreams,
 	if (gb_nstreams > GB_CAMERA_MAX_STREAMS)
 		return -EINVAL;
 
-	gb_streams = kzalloc_objs(*gb_streams, gb_nstreams, GFP_KERNEL);
+	gb_streams = kzalloc_objs(*gb_streams, gb_nstreams);
 	if (!gb_streams)
 		return -ENOMEM;
 
@@ -932,7 +932,7 @@ static ssize_t gb_camera_debugfs_configure_streams(struct gb_camera *gcam,
 		return ret;
 
 	/* For each stream to configure parse width, height and format */
-	streams = kzalloc_objs(*streams, nstreams, GFP_KERNEL);
+	streams = kzalloc_objs(*streams, nstreams);
 	if (!streams)
 		return -ENOMEM;
 
@@ -1244,7 +1244,7 @@ static int gb_camera_probe(struct gb_bundle *bundle,
 	if (!mgmt_cport_id || !data_cport_id)
 		return -ENODEV;
 
-	gcam = kzalloc_obj(*gcam, GFP_KERNEL);
+	gcam = kzalloc_obj(*gcam);
 	if (!gcam)
 		return -ENOMEM;
 
diff --git a/drivers/staging/greybus/fw-core.c b/drivers/staging/greybus/fw-core.c
index 8a437361302c..2016a74f137f 100644
--- a/drivers/staging/greybus/fw-core.c
+++ b/drivers/staging/greybus/fw-core.c
@@ -68,7 +68,7 @@ static int gb_fw_core_probe(struct gb_bundle *bundle,
 	u16 cport_id;
 	u8 protocol_id;
 
-	fw_core = kzalloc_obj(*fw_core, GFP_KERNEL);
+	fw_core = kzalloc_obj(*fw_core);
 	if (!fw_core)
 		return -ENOMEM;
 
diff --git a/drivers/staging/greybus/fw-download.c b/drivers/staging/greybus/fw-download.c
index 0216282f72f2..a0a683447b3d 100644
--- a/drivers/staging/greybus/fw-download.c
+++ b/drivers/staging/greybus/fw-download.c
@@ -165,7 +165,7 @@ static struct fw_request *find_firmware(struct fw_download *fw_download,
 	struct fw_request *fw_req;
 	int ret, req_count;
 
-	fw_req = kzalloc_obj(*fw_req, GFP_KERNEL);
+	fw_req = kzalloc_obj(*fw_req);
 	if (!fw_req)
 		return ERR_PTR(-ENOMEM);
 
@@ -409,7 +409,7 @@ int gb_fw_download_connection_init(struct gb_connection *connection)
 	if (!connection)
 		return 0;
 
-	fw_download = kzalloc_obj(*fw_download, GFP_KERNEL);
+	fw_download = kzalloc_obj(*fw_download);
 	if (!fw_download)
 		return -ENOMEM;
 
diff --git a/drivers/staging/greybus/fw-management.c b/drivers/staging/greybus/fw-management.c
index 012ed95d750e..5d01da6b6eb9 100644
--- a/drivers/staging/greybus/fw-management.c
+++ b/drivers/staging/greybus/fw-management.c
@@ -577,7 +577,7 @@ int gb_fw_mgmt_connection_init(struct gb_connection *connection)
 	if (!connection)
 		return 0;
 
-	fw_mgmt = kzalloc_obj(*fw_mgmt, GFP_KERNEL);
+	fw_mgmt = kzalloc_obj(*fw_mgmt);
 	if (!fw_mgmt)
 		return -ENOMEM;
 
diff --git a/drivers/staging/greybus/gbphy.c b/drivers/staging/greybus/gbphy.c
index 24556c686e62..bdb0f5164a6f 100644
--- a/drivers/staging/greybus/gbphy.c
+++ b/drivers/staging/greybus/gbphy.c
@@ -229,7 +229,7 @@ static struct gbphy_device *gb_gbphy_create_dev(struct gb_bundle *bundle,
 	if (id < 0)
 		return ERR_PTR(id);
 
-	gbphy_dev = kzalloc_obj(*gbphy_dev, GFP_KERNEL);
+	gbphy_dev = kzalloc_obj(*gbphy_dev);
 	if (!gbphy_dev) {
 		ida_free(&gbphy_id, id);
 		return ERR_PTR(-ENOMEM);
@@ -282,7 +282,7 @@ static int gb_gbphy_probe(struct gb_bundle *bundle,
 	if (bundle->num_cports == 0)
 		return -ENODEV;
 
-	gbphy_host = kzalloc_obj(*gbphy_host, GFP_KERNEL);
+	gbphy_host = kzalloc_obj(*gbphy_host);
 	if (!gbphy_host)
 		return -ENOMEM;
 
diff --git a/drivers/staging/greybus/gpio.c b/drivers/staging/greybus/gpio.c
index 5b30841a4205..12185f7a982c 100644
--- a/drivers/staging/greybus/gpio.c
+++ b/drivers/staging/greybus/gpio.c
@@ -485,7 +485,7 @@ static int gb_gpio_controller_setup(struct gb_gpio_controller *ggc)
 	if (ret)
 		return ret;
 
-	ggc->lines = kzalloc_objs(*ggc->lines, ggc->line_max + 1, GFP_KERNEL);
+	ggc->lines = kzalloc_objs(*ggc->lines, ggc->line_max + 1);
 	if (!ggc->lines)
 		return -ENOMEM;
 
@@ -502,7 +502,7 @@ static int gb_gpio_probe(struct gbphy_device *gbphy_dev,
 	struct irq_chip *irqc;
 	int ret;
 
-	ggc = kzalloc_obj(*ggc, GFP_KERNEL);
+	ggc = kzalloc_obj(*ggc);
 	if (!ggc)
 		return -ENOMEM;
 
diff --git a/drivers/staging/greybus/hid.c b/drivers/staging/greybus/hid.c
index 2b5e6a7b04e6..1f58c907c036 100644
--- a/drivers/staging/greybus/hid.c
+++ b/drivers/staging/greybus/hid.c
@@ -434,7 +434,7 @@ static int gb_hid_probe(struct gb_bundle *bundle,
 	if (cport_desc->protocol_id != GREYBUS_PROTOCOL_HID)
 		return -ENODEV;
 
-	ghid = kzalloc_obj(*ghid, GFP_KERNEL);
+	ghid = kzalloc_obj(*ghid);
 	if (!ghid)
 		return -ENOMEM;
 
diff --git a/drivers/staging/greybus/i2c.c b/drivers/staging/greybus/i2c.c
index e6934459c8f6..7b6f42113065 100644
--- a/drivers/staging/greybus/i2c.c
+++ b/drivers/staging/greybus/i2c.c
@@ -235,7 +235,7 @@ static int gb_i2c_probe(struct gbphy_device *gbphy_dev,
 	struct i2c_adapter *adapter;
 	int ret;
 
-	gb_i2c_dev = kzalloc_obj(*gb_i2c_dev, GFP_KERNEL);
+	gb_i2c_dev = kzalloc_obj(*gb_i2c_dev);
 	if (!gb_i2c_dev)
 		return -ENOMEM;
 
diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c
index 5b8694d3943b..aa93af873d63 100644
--- a/drivers/staging/greybus/light.c
+++ b/drivers/staging/greybus/light.c
@@ -269,10 +269,10 @@ static int channel_attr_groups_set(struct gb_channel *channel,
 		return 0;
 
 	/* Set attributes based in the channel flags */
-	channel->attrs = kzalloc_objs(*channel->attrs, size + 1, GFP_KERNEL);
+	channel->attrs = kzalloc_objs(*channel->attrs, size + 1);
 	if (!channel->attrs)
 		return -ENOMEM;
-	channel->attr_group = kzalloc_obj(*channel->attr_group, GFP_KERNEL);
+	channel->attr_group = kzalloc_obj(*channel->attr_group);
 	if (!channel->attr_group)
 		return -ENOMEM;
 	channel->attr_groups = kzalloc_objs(*channel->attr_groups, 2,
@@ -1262,7 +1262,7 @@ static int gb_lights_probe(struct gb_bundle *bundle,
 	if (cport_desc->protocol_id != GREYBUS_PROTOCOL_LIGHTS)
 		return -ENODEV;
 
-	glights = kzalloc_obj(*glights, GFP_KERNEL);
+	glights = kzalloc_obj(*glights);
 	if (!glights)
 		return -ENOMEM;
 
diff --git a/drivers/staging/greybus/log.c b/drivers/staging/greybus/log.c
index 77fb9880c695..815d20ba9b6b 100644
--- a/drivers/staging/greybus/log.c
+++ b/drivers/staging/greybus/log.c
@@ -77,7 +77,7 @@ static int gb_log_probe(struct gb_bundle *bundle,
 	if (cport_desc->protocol_id != GREYBUS_PROTOCOL_LOG)
 		return -ENODEV;
 
-	log = kzalloc_obj(*log, GFP_KERNEL);
+	log = kzalloc_obj(*log);
 	if (!log)
 		return -ENOMEM;
 
diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c
index 37a8cbf140ad..aa9c73cb0ae5 100644
--- a/drivers/staging/greybus/loopback.c
+++ b/drivers/staging/greybus/loopback.c
@@ -471,7 +471,7 @@ static int gb_loopback_async_operation(struct gb_loopback *gb, int type,
 	struct gb_operation *operation;
 	int ret;
 
-	op_async = kzalloc_obj(*op_async, GFP_KERNEL);
+	op_async = kzalloc_obj(*op_async);
 	if (!op_async)
 		return -ENOMEM;
 
@@ -989,7 +989,7 @@ static int gb_loopback_probe(struct gb_bundle *bundle,
 	if (cport_desc->protocol_id != GREYBUS_PROTOCOL_LOOPBACK)
 		return -ENODEV;
 
-	gb = kzalloc_obj(*gb, GFP_KERNEL);
+	gb = kzalloc_obj(*gb);
 	if (!gb)
 		return -ENOMEM;
 
diff --git a/drivers/staging/greybus/power_supply.c b/drivers/staging/greybus/power_supply.c
index 94e3650a2880..c51efeaee707 100644
--- a/drivers/staging/greybus/power_supply.c
+++ b/drivers/staging/greybus/power_supply.c
@@ -1063,7 +1063,7 @@ static int gb_power_supply_probe(struct gb_bundle *bundle,
 	if (cport_desc->protocol_id != GREYBUS_PROTOCOL_POWER_SUPPLY)
 		return -ENODEV;
 
-	supplies = kzalloc_obj(*supplies, GFP_KERNEL);
+	supplies = kzalloc_obj(*supplies);
 	if (!supplies)
 		return -ENOMEM;
 
diff --git a/drivers/staging/greybus/raw.c b/drivers/staging/greybus/raw.c
index 742b3a84cf12..a8b598ed9269 100644
--- a/drivers/staging/greybus/raw.c
+++ b/drivers/staging/greybus/raw.c
@@ -164,7 +164,7 @@ static int gb_raw_probe(struct gb_bundle *bundle,
 	if (cport_desc->protocol_id != GREYBUS_PROTOCOL_RAW)
 		return -ENODEV;
 
-	raw = kzalloc_obj(*raw, GFP_KERNEL);
+	raw = kzalloc_obj(*raw);
 	if (!raw)
 		return -ENOMEM;
 
diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c
index 99eff4b97e7a..7d060b4cd33d 100644
--- a/drivers/staging/greybus/uart.c
+++ b/drivers/staging/greybus/uart.c
@@ -823,7 +823,7 @@ static int gb_uart_probe(struct gbphy_device *gbphy_dev,
 		goto exit_connection_destroy;
 	}
 
-	gb_tty = kzalloc_obj(*gb_tty, GFP_KERNEL);
+	gb_tty = kzalloc_obj(*gb_tty);
 	if (!gb_tty) {
 		retval = -ENOMEM;
 		goto exit_connection_destroy;
diff --git a/drivers/staging/greybus/vibrator.c b/drivers/staging/greybus/vibrator.c
index fc995fe41604..0ec4d317c9db 100644
--- a/drivers/staging/greybus/vibrator.c
+++ b/drivers/staging/greybus/vibrator.c
@@ -128,7 +128,7 @@ static int gb_vibrator_probe(struct gb_bundle *bundle,
 	if (cport_desc->protocol_id != GREYBUS_PROTOCOL_VIBRATOR)
 		return -ENODEV;
 
-	vib = kzalloc_obj(*vib, GFP_KERNEL);
+	vib = kzalloc_obj(*vib);
 	if (!vib)
 		return -ENOMEM;
 
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
index a67eeed04b0c..d3414312e1de 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
@@ -794,7 +794,7 @@ static int gc2235_probe(struct i2c_client *client)
 	int ret;
 	unsigned int i;
 
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (!dev)
 		return -ENOMEM;
 
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
index 38568259bd7f..2c41c496daa6 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
@@ -952,7 +952,7 @@ static int ov2722_probe(struct i2c_client *client)
 	void *ovpdev;
 	int ret;
 
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (!dev)
 		return -ENOMEM;
 
diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
index 4584f0ee15f0..fec369575d88 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
@@ -2960,7 +2960,7 @@ int atomisp_set_parameters(struct video_device *vdev,
 		 * are ready, the parameters will be set to CSS.
 		 * per-frame setting only works for the main output frame.
 		 */
-		param = kvzalloc_obj(*param, GFP_KERNEL);
+		param = kvzalloc_obj(*param);
 		if (!param)
 			return -ENOMEM;
 		css_param = &param->params;
diff --git a/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c b/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
index 27d3c7d83e21..4026e98c5845 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
@@ -969,7 +969,7 @@ static int camera_sensor_csi_alloc(struct v4l2_subdev *sd, u32 port, u32 lanes,
 	struct i2c_client *client = v4l2_get_subdevdata(sd);
 	struct camera_mipi_info *csi;
 
-	csi = kzalloc_obj(*csi, GFP_KERNEL);
+	csi = kzalloc_obj(*csi);
 	if (!csi)
 		return -ENOMEM;
 
diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
index 8181e988266a..856561e951a5 100644
--- a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
+++ b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
@@ -676,7 +676,7 @@ int hmm_bo_alloc_pages(struct hmm_buffer_object *bo,
 	mutex_lock(&bo->mutex);
 	check_bo_status_no_goto(bo, HMM_BO_PAGE_ALLOCED, status_err);
 
-	bo->pages = kzalloc_objs(struct page *, bo->pgnr, GFP_KERNEL);
+	bo->pages = kzalloc_objs(struct page *, bo->pgnr);
 	if (unlikely(!bo->pages)) {
 		ret = -ENOMEM;
 		goto alloc_err;
diff --git a/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
index 473e71e1bb59..bd2def6c341a 100644
--- a/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
+++ b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
@@ -309,7 +309,7 @@ ia_css_isp_dvs_statistics_allocate(
 	if (!grid->enable)
 		return NULL;
 
-	me = kvzalloc_objs(*me, 1, GFP_KERNEL);
+	me = kvzalloc_objs(*me, 1);
 	if (!me)
 		goto err;
 
@@ -350,7 +350,7 @@ ia_css_isp_dvs_statistics_map_allocate(
 	 * so we use a local char * instead. */
 	char *base_ptr;
 
-	me = kvmalloc_obj(*me, GFP_KERNEL);
+	me = kvmalloc_obj(*me);
 	if (!me) {
 		IA_CSS_LOG("cannot allocate memory");
 		goto err;
diff --git a/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
index f84ee4c683f4..4a38d678f334 100644
--- a/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
+++ b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
@@ -274,7 +274,7 @@ ia_css_isp_dvs2_statistics_allocate(
 	if (!grid->enable)
 		return NULL;
 
-	me = kvzalloc_objs(*me, 1, GFP_KERNEL);
+	me = kvzalloc_objs(*me, 1);
 	if (!me)
 		goto err;
 
diff --git a/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c b/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c
index 2217e3623a23..8614efc28b19 100644
--- a/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c
+++ b/drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c
@@ -650,7 +650,7 @@ static struct ia_css_frame *frame_create(unsigned int width,
 	unsigned int raw_bit_depth,
 	bool valid)
 {
-	struct ia_css_frame *me = kvmalloc_obj(*me, GFP_KERNEL);
+	struct ia_css_frame *me = kvmalloc_obj(*me);
 
 	if (!me)
 		return NULL;
diff --git a/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c b/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c
index 2a1ba0a9c916..0470871f8fff 100644
--- a/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c
+++ b/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c
@@ -579,7 +579,7 @@ static int pipeline_stage_create(
 		out_frame[i] = stage_desc->out_frame[i];
 	}
 
-	stage = kvzalloc_obj(*stage, GFP_KERNEL);
+	stage = kvzalloc_obj(*stage);
 	if (!stage) {
 		err = -ENOMEM;
 		goto ERR;
diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
index abf598b2811f..78ea854d903d 100644
--- a/drivers/staging/media/atomisp/pci/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/sh_css.c
@@ -1880,7 +1880,7 @@ create_pipe(enum ia_css_pipe_mode mode,
 		return -EINVAL;
 	}
 
-	me = kmalloc_obj(*me, GFP_KERNEL);
+	me = kmalloc_obj(*me);
 	if (!me)
 		return -ENOMEM;
 
@@ -7910,7 +7910,7 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config,
 	}
 
 	/* allocate the stream instance */
-	curr_stream = kzalloc_obj(struct ia_css_stream, GFP_KERNEL);
+	curr_stream = kzalloc_obj(struct ia_css_stream);
 	if (!curr_stream) {
 		err = -ENOMEM;
 		IA_CSS_LEAVE_ERR(err);
diff --git a/drivers/staging/media/atomisp/pci/sh_css_host_data.c b/drivers/staging/media/atomisp/pci/sh_css_host_data.c
index c9400600c241..d8f8e5e4482c 100644
--- a/drivers/staging/media/atomisp/pci/sh_css_host_data.c
+++ b/drivers/staging/media/atomisp/pci/sh_css_host_data.c
@@ -12,7 +12,7 @@ struct ia_css_host_data *ia_css_host_data_allocate(size_t size)
 {
 	struct ia_css_host_data *me;
 
-	me =  kmalloc_obj(struct ia_css_host_data, GFP_KERNEL);
+	me =  kmalloc_obj(struct ia_css_host_data);
 	if (!me)
 		return NULL;
 	me->size = (uint32_t)size;
diff --git a/drivers/staging/media/atomisp/pci/sh_css_param_dvs.c b/drivers/staging/media/atomisp/pci/sh_css_param_dvs.c
index 19f1b71a5c06..9ccdb66de2df 100644
--- a/drivers/staging/media/atomisp/pci/sh_css_param_dvs.c
+++ b/drivers/staging/media/atomisp/pci/sh_css_param_dvs.c
@@ -22,7 +22,7 @@ alloc_dvs_6axis_table(const struct ia_css_resolution *frame_res,
 	int err = 0;
 	struct ia_css_dvs_6axis_config  *dvs_config = NULL;
 
-	dvs_config = kvmalloc_obj(struct ia_css_dvs_6axis_config, GFP_KERNEL);
+	dvs_config = kvmalloc_obj(struct ia_css_dvs_6axis_config);
 	if (!dvs_config)	{
 		IA_CSS_ERROR("out of memory");
 		err = -ENOMEM;
diff --git a/drivers/staging/media/atomisp/pci/sh_css_param_shading.c b/drivers/staging/media/atomisp/pci/sh_css_param_shading.c
index e9ce4ef6a991..9105334c71b1 100644
--- a/drivers/staging/media/atomisp/pci/sh_css_param_shading.c
+++ b/drivers/staging/media/atomisp/pci/sh_css_param_shading.c
@@ -328,7 +328,7 @@ ia_css_shading_table_alloc(
 
 	IA_CSS_ENTER("");
 
-	me = kmalloc_obj(*me, GFP_KERNEL);
+	me = kmalloc_obj(*me);
 	if (!me)
 		return me;
 
diff --git a/drivers/staging/media/atomisp/pci/sh_css_params.c b/drivers/staging/media/atomisp/pci/sh_css_params.c
index ab9ab7b2f177..424876311da5 100644
--- a/drivers/staging/media/atomisp/pci/sh_css_params.c
+++ b/drivers/staging/media/atomisp/pci/sh_css_params.c
@@ -1369,7 +1369,7 @@ struct ia_css_morph_table *ia_css_morph_table_allocate(
 
 	IA_CSS_ENTER("");
 
-	me = kvmalloc_obj(*me, GFP_KERNEL);
+	me = kvmalloc_obj(*me);
 	if (!me) {
 		IA_CSS_ERROR("out of memory");
 		return me;
@@ -1516,7 +1516,7 @@ ia_css_isp_3a_statistics_map_allocate(
 	 * so we use a local char * instead. */
 	char *base_ptr;
 
-	me = kvmalloc_obj(*me, GFP_KERNEL);
+	me = kvmalloc_obj(*me);
 	if (!me) {
 		IA_CSS_LEAVE("cannot allocate memory");
 		goto err;
@@ -2136,7 +2136,7 @@ ia_css_isp_3a_statistics_allocate(const struct ia_css_3a_grid_info *grid)
 	if (!grid->enable)
 		return NULL;
 
-	me = kvzalloc_objs(*me, 1, GFP_KERNEL);
+	me = kvzalloc_objs(*me, 1);
 	if (!me)
 		goto err;
 
@@ -2200,7 +2200,7 @@ ia_css_metadata_allocate(const struct ia_css_metadata_info *metadata_info)
 	if (metadata_info->size == 0)
 		return NULL;
 
-	md = kvmalloc_obj(*md, GFP_KERNEL);
+	md = kvmalloc_obj(*md);
 	if (!md)
 		goto error;
 
@@ -2330,7 +2330,7 @@ sh_css_create_isp_params(struct ia_css_stream *stream,
 	int err;
 	size_t params_size;
 	struct ia_css_isp_parameters *params =
-	kvmalloc_obj(struct ia_css_isp_parameters, GFP_KERNEL);
+	kvmalloc_obj(struct ia_css_isp_parameters);
 
 	if (!params) {
 		*isp_params_out = NULL;
@@ -4161,7 +4161,7 @@ ia_css_3a_statistics_allocate(const struct ia_css_3a_grid_info *grid)
 
 	assert(grid);
 
-	me = kvzalloc_objs(*me, 1, GFP_KERNEL);
+	me = kvzalloc_objs(*me, 1);
 	if (!me)
 		goto err;
 
@@ -4201,7 +4201,7 @@ ia_css_dvs_statistics_allocate(const struct ia_css_dvs_grid_info *grid)
 
 	assert(grid);
 
-	me = kvzalloc_objs(*me, 1, GFP_KERNEL);
+	me = kvzalloc_objs(*me, 1);
 	if (!me)
 		goto err;
 
@@ -4239,7 +4239,7 @@ ia_css_dvs_coefficients_allocate(const struct ia_css_dvs_grid_info *grid)
 
 	assert(grid);
 
-	me = kvzalloc_objs(*me, 1, GFP_KERNEL);
+	me = kvzalloc_objs(*me, 1);
 	if (!me)
 		goto err;
 
@@ -4280,7 +4280,7 @@ ia_css_dvs2_statistics_allocate(const struct ia_css_dvs_grid_info *grid)
 
 	assert(grid);
 
-	me = kvzalloc_objs(*me, 1, GFP_KERNEL);
+	me = kvzalloc_objs(*me, 1);
 	if (!me)
 		goto err;
 
@@ -4371,7 +4371,7 @@ ia_css_dvs2_coefficients_allocate(const struct ia_css_dvs_grid_info *grid)
 
 	assert(grid);
 
-	me = kvzalloc_objs(*me, 1, GFP_KERNEL);
+	me = kvzalloc_objs(*me, 1);
 	if (!me)
 		goto err;
 
diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c
index bdd3cc28e364..607992100baf 100644
--- a/drivers/staging/media/av7110/av7110.c
+++ b/drivers/staging/media/av7110/av7110.c
@@ -2424,7 +2424,7 @@ static int av7110_attach(struct saa7146_dev *dev,
 	}
 
 	/* prepare the av7110 device struct */
-	av7110 = kzalloc_obj(*av7110, GFP_KERNEL);
+	av7110 = kzalloc_obj(*av7110);
 	if (!av7110) {
 		dprintk(1, "out of memory\n");
 		return -ENOMEM;
diff --git a/drivers/staging/media/av7110/sp8870.c b/drivers/staging/media/av7110/sp8870.c
index 2254a5f3a351..29fb4934c039 100644
--- a/drivers/staging/media/av7110/sp8870.c
+++ b/drivers/staging/media/av7110/sp8870.c
@@ -563,7 +563,7 @@ struct dvb_frontend *sp8870_attach(const struct sp8870_config *config,
 	struct sp8870_state *state = NULL;
 
 	/* allocate memory for the internal state */
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (!state)
 		goto error;
 
diff --git a/drivers/staging/media/imx/imx-media-csc-scaler.c b/drivers/staging/media/imx/imx-media-csc-scaler.c
index f068ead6c088..00fcdd4d0487 100644
--- a/drivers/staging/media/imx/imx-media-csc-scaler.c
+++ b/drivers/staging/media/imx/imx-media-csc-scaler.c
@@ -124,7 +124,7 @@ static void device_run(void *_ctx)
 	src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
 	dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
 
-	run = kzalloc_obj(*run, GFP_KERNEL);
+	run = kzalloc_obj(*run);
 	if (!run)
 		goto err;
 
@@ -756,7 +756,7 @@ static int ipu_csc_scaler_open(struct file *file)
 	struct ipu_csc_scaler_ctx *ctx = NULL;
 	int ret;
 
-	ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+	ctx = kzalloc_obj(*ctx);
 	if (!ctx)
 		return -ENOMEM;
 
@@ -880,7 +880,7 @@ imx_media_csc_scaler_device_init(struct imx_media_dev *md)
 	struct video_device *vfd;
 	int ret;
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/staging/media/ipu3/ipu3-css-fw.c b/drivers/staging/media/ipu3/ipu3-css-fw.c
index 0f242dd27288..146e92ce6e4c 100644
--- a/drivers/staging/media/ipu3/ipu3-css-fw.c
+++ b/drivers/staging/media/ipu3/ipu3-css-fw.c
@@ -236,7 +236,7 @@ int imgu_css_fw_init(struct imgu_css *css)
 
 	/* Allocate and map fw binaries into IMGU */
 
-	css->binary = kzalloc_objs(*css->binary, binary_nr, GFP_KERNEL);
+	css->binary = kzalloc_objs(*css->binary, binary_nr);
 	if (!css->binary) {
 		r = -ENOMEM;
 		goto error_out;
diff --git a/drivers/staging/media/ipu3/ipu3-css.c b/drivers/staging/media/ipu3/ipu3-css.c
index 3fb863043c71..8063401246fb 100644
--- a/drivers/staging/media/ipu3/ipu3-css.c
+++ b/drivers/staging/media/ipu3/ipu3-css.c
@@ -1702,7 +1702,7 @@ int imgu_css_fmt_try(struct imgu_css *css,
 	struct v4l2_pix_format_mplane *in, *out, *vf;
 	int i, s, ret;
 
-	q = kzalloc_objs(struct imgu_css_queue, IPU3_CSS_QUEUES, GFP_KERNEL);
+	q = kzalloc_objs(struct imgu_css_queue, IPU3_CSS_QUEUES);
 	if (!q)
 		return -ENOMEM;
 
diff --git a/drivers/staging/media/ipu3/ipu3-dmamap.c b/drivers/staging/media/ipu3/ipu3-dmamap.c
index 9f6025aa8a1f..ef208a059ef6 100644
--- a/drivers/staging/media/ipu3/ipu3-dmamap.c
+++ b/drivers/staging/media/ipu3/ipu3-dmamap.c
@@ -39,7 +39,7 @@ static struct page **imgu_dmamap_alloc_buffer(size_t size, gfp_t gfp)
 	const gfp_t high_order_gfp = __GFP_NOWARN | __GFP_NORETRY;
 
 	/* Allocate mem for array of page ptrs */
-	pages = kvmalloc_objs(*pages, count, GFP_KERNEL);
+	pages = kvmalloc_objs(*pages, count);
 
 	if (!pages)
 		return NULL;
diff --git a/drivers/staging/media/ipu3/ipu3-mmu.c b/drivers/staging/media/ipu3/ipu3-mmu.c
index 03583d37fdd0..b196a5815903 100644
--- a/drivers/staging/media/ipu3/ipu3-mmu.c
+++ b/drivers/staging/media/ipu3/ipu3-mmu.c
@@ -429,7 +429,7 @@ struct imgu_mmu_info *imgu_mmu_init(struct device *parent, void __iomem *base)
 	struct imgu_mmu *mmu;
 	u32 pteval;
 
-	mmu = kzalloc_obj(*mmu, GFP_KERNEL);
+	mmu = kzalloc_obj(*mmu);
 	if (!mmu)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/staging/media/ipu7/ipu7-bus.c b/drivers/staging/media/ipu7/ipu7-bus.c
index 583825d15230..7a1b0744b236 100644
--- a/drivers/staging/media/ipu7/ipu7-bus.c
+++ b/drivers/staging/media/ipu7/ipu7-bus.c
@@ -89,7 +89,7 @@ ipu7_bus_initialize_device(struct pci_dev *pdev, struct device *parent,
 	struct ipu7_device *isp = pci_get_drvdata(pdev);
 	int ret;
 
-	adev = kzalloc_obj(*adev, GFP_KERNEL);
+	adev = kzalloc_obj(*adev);
 	if (!adev)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/staging/media/ipu7/ipu7-dma.c b/drivers/staging/media/ipu7/ipu7-dma.c
index 4f934e4c930b..9a356ae3b95a 100644
--- a/drivers/staging/media/ipu7/ipu7-dma.c
+++ b/drivers/staging/media/ipu7/ipu7-dma.c
@@ -164,7 +164,7 @@ void *ipu7_dma_alloc(struct ipu7_bus_device *sys, size_t size,
 	unsigned int i;
 	int ret;
 
-	info = kzalloc_obj(*info, GFP_KERNEL);
+	info = kzalloc_obj(*info);
 	if (!info)
 		return NULL;
 
diff --git a/drivers/staging/media/ipu7/ipu7-mmu.c b/drivers/staging/media/ipu7/ipu7-mmu.c
index dfed9872bdfd..6ded07ccd780 100644
--- a/drivers/staging/media/ipu7/ipu7-mmu.c
+++ b/drivers/staging/media/ipu7/ipu7-mmu.c
@@ -584,7 +584,7 @@ static struct ipu7_mmu_info *ipu7_mmu_alloc(struct ipu7_device *isp)
 	struct ipu7_mmu_info *mmu_info;
 	int ret;
 
-	mmu_info = kzalloc_obj(*mmu_info, GFP_KERNEL);
+	mmu_info = kzalloc_obj(*mmu_info);
 	if (!mmu_info)
 		return NULL;
 
@@ -654,7 +654,7 @@ static struct ipu7_dma_mapping *alloc_dma_mapping(struct ipu7_device *isp)
 	struct ipu7_dma_mapping *dmap;
 	unsigned long base_pfn;
 
-	dmap = kzalloc_obj(*dmap, GFP_KERNEL);
+	dmap = kzalloc_obj(*dmap);
 	if (!dmap)
 		return NULL;
 
diff --git a/drivers/staging/media/ipu7/ipu7.c b/drivers/staging/media/ipu7/ipu7.c
index 47b859e1fa0f..c771e763f8c5 100644
--- a/drivers/staging/media/ipu7/ipu7.c
+++ b/drivers/staging/media/ipu7/ipu7.c
@@ -2150,7 +2150,7 @@ ipu7_isys_init(struct pci_dev *pdev, struct device *parent,
 		}
 	}
 
-	pdata = kzalloc_obj(*pdata, GFP_KERNEL);
+	pdata = kzalloc_obj(*pdata);
 	if (!pdata)
 		return ERR_PTR(-ENOMEM);
 
@@ -2197,7 +2197,7 @@ ipu7_psys_init(struct pci_dev *pdev, struct device *parent,
 	struct ipu7_psys_pdata *pdata;
 	int ret;
 
-	pdata = kzalloc_obj(*pdata, GFP_KERNEL);
+	pdata = kzalloc_obj(*pdata);
 	if (!pdata)
 		return ERR_PTR(-ENOMEM);
 
@@ -2271,7 +2271,7 @@ static int ipu7_map_fw_code_region(struct ipu7_bus_device *sys,
 
 	n_pages = PFN_UP(size);
 
-	pages = kmalloc_objs(*pages, n_pages, GFP_KERNEL);
+	pages = kmalloc_objs(*pages, n_pages);
 	if (!pages)
 		return -ENOMEM;
 
diff --git a/drivers/staging/media/meson/vdec/codec_h264.c b/drivers/staging/media/meson/vdec/codec_h264.c
index bafa7e99abf1..89e0f8624e5b 100644
--- a/drivers/staging/media/meson/vdec/codec_h264.c
+++ b/drivers/staging/media/meson/vdec/codec_h264.c
@@ -233,7 +233,7 @@ static int codec_h264_load_extended_firmware(struct amvdec_session *sess,
 	if (len < SIZE_EXT_FW)
 		return -EINVAL;
 
-	h264 = kzalloc_obj(*h264, GFP_KERNEL);
+	h264 = kzalloc_obj(*h264);
 	if (!h264)
 		return -ENOMEM;
 
diff --git a/drivers/staging/media/meson/vdec/codec_mpeg12.c b/drivers/staging/media/meson/vdec/codec_mpeg12.c
index 01adf66fb50a..76e9ca7191ab 100644
--- a/drivers/staging/media/meson/vdec/codec_mpeg12.c
+++ b/drivers/staging/media/meson/vdec/codec_mpeg12.c
@@ -66,7 +66,7 @@ static int codec_mpeg12_start(struct amvdec_session *sess)
 	struct codec_mpeg12 *mpeg12;
 	int ret;
 
-	mpeg12 = kzalloc_obj(*mpeg12, GFP_KERNEL);
+	mpeg12 = kzalloc_obj(*mpeg12);
 	if (!mpeg12)
 		return -ENOMEM;
 
diff --git a/drivers/staging/media/meson/vdec/codec_vp9.c b/drivers/staging/media/meson/vdec/codec_vp9.c
index c82f7be67bc5..8e80ecf84193 100644
--- a/drivers/staging/media/meson/vdec/codec_vp9.c
+++ b/drivers/staging/media/meson/vdec/codec_vp9.c
@@ -762,7 +762,7 @@ static int codec_vp9_start(struct amvdec_session *sess)
 	int i;
 	int ret;
 
-	vp9 = kzalloc_obj(*vp9, GFP_KERNEL);
+	vp9 = kzalloc_obj(*vp9);
 	if (!vp9)
 		return -ENOMEM;
 
@@ -1192,7 +1192,7 @@ static struct vp9_frame *codec_vp9_get_new_frame(struct amvdec_session *sess)
 	struct vb2_v4l2_buffer *vbuf;
 	struct vp9_frame *new_frame;
 
-	new_frame = kzalloc_obj(*new_frame, GFP_KERNEL);
+	new_frame = kzalloc_obj(*new_frame);
 	if (!new_frame)
 		return NULL;
 
diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c
index befd3c3762cc..4b77ec1af5a7 100644
--- a/drivers/staging/media/meson/vdec/vdec.c
+++ b/drivers/staging/media/meson/vdec/vdec.c
@@ -132,7 +132,7 @@ vdec_queue_recycle(struct amvdec_session *sess, struct vb2_buffer *vb)
 {
 	struct amvdec_buffer *new_buf;
 
-	new_buf = kmalloc_obj(*new_buf, GFP_KERNEL);
+	new_buf = kmalloc_obj(*new_buf);
 	if (!new_buf)
 		return;
 	new_buf->vb = vb;
@@ -867,7 +867,7 @@ static int vdec_open(struct file *file)
 	struct amvdec_session *sess;
 	int ret;
 
-	sess = kzalloc_obj(*sess, GFP_KERNEL);
+	sess = kzalloc_obj(*sess);
 	if (!sess)
 		return -ENOMEM;
 
diff --git a/drivers/staging/media/meson/vdec/vdec_helpers.c b/drivers/staging/media/meson/vdec/vdec_helpers.c
index 86ed5b8113d2..f02c21d5a9c1 100644
--- a/drivers/staging/media/meson/vdec/vdec_helpers.c
+++ b/drivers/staging/media/meson/vdec/vdec_helpers.c
@@ -233,7 +233,7 @@ int amvdec_add_ts(struct amvdec_session *sess, u64 ts,
 	struct amvdec_timestamp *new_ts;
 	unsigned long flags;
 
-	new_ts = kzalloc_obj(*new_ts, GFP_KERNEL);
+	new_ts = kzalloc_obj(*new_ts);
 	if (!new_ts)
 		return -ENOMEM;
 
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c
index accaee635d21..6600245dff0e 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
@@ -359,7 +359,7 @@ static int cedrus_open(struct file *file)
 	if (mutex_lock_interruptible(&dev->dev_mutex))
 		return -ERESTARTSYS;
 
-	ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+	ctx = kzalloc_obj(*ctx);
 	if (!ctx) {
 		mutex_unlock(&dev->dev_mutex);
 		return -ENOMEM;
diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c
index 98e3a97ee658..7842104ca933 100644
--- a/drivers/staging/media/tegra-video/csi.c
+++ b/drivers/staging/media/tegra-video/csi.c
@@ -463,7 +463,7 @@ static int tegra_csi_channel_alloc(struct tegra_csi *csi,
 	struct tegra_csi_channel *chan;
 	int ret = 0, i;
 
-	chan = kzalloc_obj(*chan, GFP_KERNEL);
+	chan = kzalloc_obj(*chan);
 	if (!chan)
 		return -ENOMEM;
 
diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c
index a86d0223f6c3..9c0b38585d63 100644
--- a/drivers/staging/media/tegra-video/vi.c
+++ b/drivers/staging/media/tegra-video/vi.c
@@ -1209,7 +1209,7 @@ static int tegra_vi_channel_alloc(struct tegra_vi *vi, unsigned int port_num,
 	 * be holding the device node open. Channel memory allocated
 	 * with kzalloc is freed during video device release callback.
 	 */
-	chan = kzalloc_obj(*chan, GFP_KERNEL);
+	chan = kzalloc_obj(*chan);
 	if (!chan)
 		return -ENOMEM;
 
diff --git a/drivers/staging/media/tegra-video/video.c b/drivers/staging/media/tegra-video/video.c
index 06d85292c0d2..ae1ae03fa9de 100644
--- a/drivers/staging/media/tegra-video/video.c
+++ b/drivers/staging/media/tegra-video/video.c
@@ -46,7 +46,7 @@ static int host1x_video_probe(struct host1x_device *dev)
 	struct tegra_video_device *vid;
 	int ret;
 
-	vid = kzalloc_obj(*vid, GFP_KERNEL);
+	vid = kzalloc_obj(*vid);
 	if (!vid)
 		return -ENOMEM;
 
diff --git a/drivers/staging/most/dim2/dim2.c b/drivers/staging/most/dim2/dim2.c
index 16b1aca26333..8d649d920433 100644
--- a/drivers/staging/most/dim2/dim2.c
+++ b/drivers/staging/most/dim2/dim2.c
@@ -759,7 +759,7 @@ static int dim2_probe(struct platform_device *pdev)
 
 	enum { MLB_INT_IDX, AHB0_INT_IDX };
 
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (!dev)
 		return -ENOMEM;
 
diff --git a/drivers/staging/most/video/video.c b/drivers/staging/most/video/video.c
index b0d7216f5ab5..04351f8ccccf 100644
--- a/drivers/staging/most/video/video.c
+++ b/drivers/staging/most/video/video.c
@@ -84,7 +84,7 @@ static int comp_vdev_open(struct file *filp)
 		return -EINVAL;
 	}
 
-	fh = kzalloc_obj(*fh, GFP_KERNEL);
+	fh = kzalloc_obj(*fh);
 	if (!fh)
 		return -ENOMEM;
 
@@ -474,7 +474,7 @@ static int comp_probe_channel(struct most_interface *iface, int channel_idx,
 		return -EINVAL;
 	}
 
-	mdev = kzalloc_obj(*mdev, GFP_KERNEL);
+	mdev = kzalloc_obj(*mdev);
 	if (!mdev)
 		return -ENOMEM;
 
diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c
index 3422a5213803..e6234d29e264 100644
--- a/drivers/staging/nvec/nvec_ps2.c
+++ b/drivers/staging/nvec/nvec_ps2.c
@@ -102,7 +102,7 @@ static int nvec_mouse_probe(struct platform_device *pdev)
 	struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent);
 	struct serio *ser_dev;
 
-	ser_dev = kzalloc_obj(*ser_dev, GFP_KERNEL);
+	ser_dev = kzalloc_obj(*ser_dev);
 	if (!ser_dev)
 		return -ENOMEM;
 
diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
index a90b117906ce..864cd8b6d1f1 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -1229,13 +1229,13 @@ u8 rtw_ap_set_pairwise_key(struct adapter *padapter, struct sta_info *psta)
 	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 	u8 res = _SUCCESS;
 
-	ph2c = kzalloc_obj(*ph2c, GFP_KERNEL);
+	ph2c = kzalloc_obj(*ph2c);
 	if (!ph2c) {
 		res = _FAIL;
 		goto exit;
 	}
 
-	psetstakey_para = kzalloc_obj(*psetstakey_para, GFP_KERNEL);
+	psetstakey_para = kzalloc_obj(*psetstakey_para);
 	if (!psetstakey_para) {
 		kfree(ph2c);
 		res = _FAIL;
@@ -1269,12 +1269,12 @@ static int rtw_ap_set_key(struct adapter *padapter,
 	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 	int res = _SUCCESS;
 
-	pcmd = kzalloc_obj(*pcmd, GFP_KERNEL);
+	pcmd = kzalloc_obj(*pcmd);
 	if (!pcmd) {
 		res = _FAIL;
 		goto exit;
 	}
-	psetkeyparm = kzalloc_obj(*psetkeyparm, GFP_KERNEL);
+	psetkeyparm = kzalloc_obj(*psetkeyparm);
 	if (!psetkeyparm) {
 		kfree(pcmd);
 		res = _FAIL;
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index 59f4e12535f9..abb84f8aecbe 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -634,7 +634,7 @@ int rtw_startbss_cmd(struct adapter  *padapter, int flags)
 		start_bss_network(padapter);
 	} else {
 		/* need enqueue, prepare cmd_obj and enqueue */
-		pcmd = kzalloc_obj(*pcmd, GFP_KERNEL);
+		pcmd = kzalloc_obj(*pcmd);
 		if (!pcmd) {
 			res = _FAIL;
 			goto exit;
@@ -686,7 +686,7 @@ u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)
 	u32 tmp_len;
 	u8 *ptmp = NULL;
 
-	pcmd = kzalloc_obj(*pcmd, GFP_KERNEL);
+	pcmd = kzalloc_obj(*pcmd);
 	if (!pcmd) {
 		res = _FAIL;
 		goto exit;
@@ -795,7 +795,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
 	u8 res = _SUCCESS;
 
 	/* prepare cmd parameter */
-	param = kzalloc_obj(*param, GFP_KERNEL);
+	param = kzalloc_obj(*param);
 	if (!param) {
 		res = _FAIL;
 		goto exit;
@@ -804,7 +804,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
 
 	if (enqueue) {
 		/* need enqueue, prepare cmd_obj and enqueue */
-		cmdobj = kzalloc_obj(*cmdobj, GFP_KERNEL);
+		cmdobj = kzalloc_obj(*cmdobj);
 		if (!cmdobj) {
 			res = _FAIL;
 			kfree(param);
@@ -831,7 +831,7 @@ u8 rtw_setopmode_cmd(struct adapter  *padapter, enum ndis_802_11_network_infrast
 	struct	cmd_priv   *pcmdpriv = &padapter->cmdpriv;
 	u8 res = _SUCCESS;
 
-	psetop = kzalloc_obj(*psetop, GFP_KERNEL);
+	psetop = kzalloc_obj(*psetop);
 	if (!psetop) {
 		res = _FAIL;
 		goto exit;
@@ -839,7 +839,7 @@ u8 rtw_setopmode_cmd(struct adapter  *padapter, enum ndis_802_11_network_infrast
 	psetop->mode = (u8)networktype;
 
 	if (enqueue) {
-		ph2c = kzalloc_obj(*ph2c, GFP_KERNEL);
+		ph2c = kzalloc_obj(*ph2c);
 		if (!ph2c) {
 			kfree(psetop);
 			res = _FAIL;
@@ -866,7 +866,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_
 	struct security_priv *psecuritypriv = &padapter->securitypriv;
 	u8 res = _SUCCESS;
 
-	psetstakey_para = kzalloc_obj(*psetstakey_para, GFP_KERNEL);
+	psetstakey_para = kzalloc_obj(*psetstakey_para);
 	if (!psetstakey_para) {
 		res = _FAIL;
 		goto exit;
@@ -888,14 +888,14 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_
 	padapter->securitypriv.busetkipkey = true;
 
 	if (enqueue) {
-		ph2c = kzalloc_obj(*ph2c, GFP_KERNEL);
+		ph2c = kzalloc_obj(*ph2c);
 		if (!ph2c) {
 			kfree(psetstakey_para);
 			res = _FAIL;
 			goto exit;
 		}
 
-		psetstakey_rsp = kzalloc_obj(*psetstakey_rsp, GFP_KERNEL);
+		psetstakey_rsp = kzalloc_obj(*psetstakey_rsp);
 		if (!psetstakey_rsp) {
 			kfree(ph2c);
 			kfree(psetstakey_para);
@@ -933,20 +933,20 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueu
 			rtw_camid_free(padapter, cam_id);
 		}
 	} else {
-		ph2c = kzalloc_obj(*ph2c, GFP_KERNEL);
+		ph2c = kzalloc_obj(*ph2c);
 		if (!ph2c) {
 			res = _FAIL;
 			goto exit;
 		}
 
-		psetstakey_para = kzalloc_obj(*psetstakey_para, GFP_KERNEL);
+		psetstakey_para = kzalloc_obj(*psetstakey_para);
 		if (!psetstakey_para) {
 			kfree(ph2c);
 			res = _FAIL;
 			goto exit;
 		}
 
-		psetstakey_rsp = kzalloc_obj(*psetstakey_rsp, GFP_KERNEL);
+		psetstakey_rsp = kzalloc_obj(*psetstakey_rsp);
 		if (!psetstakey_rsp) {
 			kfree(ph2c);
 			kfree(psetstakey_para);
@@ -1651,13 +1651,13 @@ u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt)
 	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 	u8 res = _SUCCESS;
 
-	ph2c = kzalloc_obj(*ph2c, GFP_KERNEL);
+	ph2c = kzalloc_obj(*ph2c);
 	if (!ph2c) {
 		res = _FAIL;
 		goto exit;
 	}
 
-	pdrvextra_cmd_parm = kzalloc_obj(*pdrvextra_cmd_parm, GFP_KERNEL);
+	pdrvextra_cmd_parm = kzalloc_obj(*pdrvextra_cmd_parm);
 	if (!pdrvextra_cmd_parm) {
 		kfree(ph2c);
 		res = _FAIL;
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 1bc90fa48d36..7df651708381 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -1875,13 +1875,13 @@ signed int rtw_set_auth(struct adapter *adapter, struct security_priv *psecurity
 	struct	cmd_priv *pcmdpriv = &adapter->cmdpriv;
 	signed int		res = _SUCCESS;
 
-	pcmd = kzalloc_obj(*pcmd, GFP_KERNEL);
+	pcmd = kzalloc_obj(*pcmd);
 	if (!pcmd) {
 		res = _FAIL;  /* try again */
 		goto exit;
 	}
 
-	psetauthparm = kzalloc_obj(*psetauthparm, GFP_KERNEL);
+	psetauthparm = kzalloc_obj(*psetauthparm);
 	if (!psetauthparm) {
 		kfree(pcmd);
 		res = _FAIL;
@@ -1912,7 +1912,7 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp
 	struct cmd_priv *pcmdpriv = &adapter->cmdpriv;
 	signed int	res = _SUCCESS;
 
-	psetkeyparm = kzalloc_obj(*psetkeyparm, GFP_KERNEL);
+	psetkeyparm = kzalloc_obj(*psetkeyparm);
 	if (!psetkeyparm) {
 		res = _FAIL;
 		goto exit;
@@ -1954,7 +1954,7 @@ signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecurityp
 	}
 
 	if (enqueue) {
-		pcmd = kzalloc_obj(*pcmd, GFP_KERNEL);
+		pcmd = kzalloc_obj(*pcmd);
 		if (!pcmd) {
 			kfree(psetkeyparm);
 			res = _FAIL;  /* try again */
diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index aceb1bfde8a4..3242978da36c 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -1131,7 +1131,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
 	if (memcmp(cur_network->network.mac_address, pbssid, 6))
 		return true;
 
-	bssid = kzalloc_obj(*bssid, GFP_KERNEL);
+	bssid = kzalloc_obj(*bssid);
 	if (!bssid)
 		return true;
 
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 64d3cbfb1244..8d259820f103 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -306,10 +306,10 @@ s32 rtl8723b_FirmwareDownload(struct adapter *padapter, bool  bUsedWoWLANFw)
 	u8 *fwfilepath;
 	u8 tmp_ps;
 
-	pFirmware = kzalloc_obj(struct rt_firmware, GFP_KERNEL);
+	pFirmware = kzalloc_obj(struct rt_firmware);
 	if (!pFirmware)
 		return _FAIL;
-	pBTFirmware = kzalloc_obj(struct rt_firmware, GFP_KERNEL);
+	pBTFirmware = kzalloc_obj(struct rt_firmware);
 	if (!pBTFirmware) {
 		kfree(pFirmware);
 		return _FAIL;
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 3922c3920bd8..7cb0c6f22bf3 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -1248,7 +1248,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
 		goto check_need_indicate_scan_done;
 	}
 
-	ssid = kzalloc_objs(*ssid, RTW_SSID_SCAN_AMOUNT, GFP_KERNEL);
+	ssid = kzalloc_objs(*ssid, RTW_SSID_SCAN_AMOUNT);
 	if (!ssid) {
 		ret = -ENOMEM;
 		goto check_need_indicate_scan_done;
@@ -2145,7 +2145,7 @@ static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str
 	pnpi->sizeof_priv = sizeof(struct adapter);
 
 	/*  wdev */
-	mon_wdev = kzalloc_obj(*mon_wdev, GFP_KERNEL);
+	mon_wdev = kzalloc_obj(*mon_wdev);
 	if (!mon_wdev) {
 		ret = -ENOMEM;
 		goto out;
@@ -2726,7 +2726,7 @@ int rtw_wdev_alloc(struct adapter *padapter, struct device *dev)
 		goto free_wiphy;
 
 	/*  wdev */
-	wdev = kzalloc_obj(*wdev, GFP_KERNEL);
+	wdev = kzalloc_obj(*wdev);
 	if (!wdev) {
 		ret = -ENOMEM;
 		goto unregister_wiphy;
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 6260f8f33c6d..29939bf5a156 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -568,7 +568,7 @@ struct dvobj_priv *devobj_init(void)
 {
 	struct dvobj_priv *pdvobj = NULL;
 
-	pdvobj = kzalloc_obj(*pdvobj, GFP_KERNEL);
+	pdvobj = kzalloc_obj(*pdvobj);
 	if (!pdvobj)
 		return NULL;
 
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
index ae9ad7a8815d..bce42bff307f 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
@@ -108,7 +108,7 @@ static int snd_bcm2835_playback_open_generic(struct snd_pcm_substream *substream
 		goto out;
 	}
 
-	alsa_stream = kzalloc_obj(*alsa_stream, GFP_KERNEL);
+	alsa_stream = kzalloc_obj(*alsa_stream);
 	if (!alsa_stream) {
 		err = -ENOMEM;
 		goto out;
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
index d9397ac8faca..3156cb8392f4 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
@@ -219,7 +219,7 @@ int bcm2835_audio_open(struct bcm2835_alsa_stream *alsa_stream)
 	int err;
 
 	/* Allocate memory for this instance */
-	instance = kzalloc_obj(*instance, GFP_KERNEL);
+	instance = kzalloc_obj(*instance);
 	if (!instance)
 		return -ENOMEM;
 	mutex_init(&instance->vchi_mutex);
diff --git a/drivers/staging/vme_user/vme.c b/drivers/staging/vme_user/vme.c
index 4ab3b572bbd7..f10a00c05f12 100644
--- a/drivers/staging/vme_user/vme.c
+++ b/drivers/staging/vme_user/vme.c
@@ -287,7 +287,7 @@ struct vme_resource *vme_slave_request(struct vme_dev *vdev, u32 address,
 	if (!allocated_image)
 		goto err_image;
 
-	resource = kmalloc_obj(*resource, GFP_KERNEL);
+	resource = kmalloc_obj(*resource);
 	if (!resource)
 		goto err_alloc;
 
@@ -484,7 +484,7 @@ struct vme_resource *vme_master_request(struct vme_dev *vdev, u32 address,
 		goto err_image;
 	}
 
-	resource = kmalloc_obj(*resource, GFP_KERNEL);
+	resource = kmalloc_obj(*resource);
 	if (!resource)
 		goto err_alloc;
 
@@ -854,7 +854,7 @@ struct vme_resource *vme_dma_request(struct vme_dev *vdev, u32 route)
 	if (!allocated_ctrlr)
 		goto err_ctrlr;
 
-	resource = kmalloc_obj(*resource, GFP_KERNEL);
+	resource = kmalloc_obj(*resource);
 	if (!resource)
 		goto err_alloc;
 
@@ -894,7 +894,7 @@ struct vme_dma_list *vme_new_dma_list(struct vme_resource *resource)
 		return NULL;
 	}
 
-	dma_list = kmalloc_obj(*dma_list, GFP_KERNEL);
+	dma_list = kmalloc_obj(*dma_list);
 	if (!dma_list)
 		return NULL;
 
@@ -924,11 +924,11 @@ struct vme_dma_attr *vme_dma_pattern_attribute(u32 pattern, u32 type)
 	struct vme_dma_attr *attributes;
 	struct vme_dma_pattern *pattern_attr;
 
-	attributes = kmalloc_obj(*attributes, GFP_KERNEL);
+	attributes = kmalloc_obj(*attributes);
 	if (!attributes)
 		goto err_attr;
 
-	pattern_attr = kmalloc_obj(*pattern_attr, GFP_KERNEL);
+	pattern_attr = kmalloc_obj(*pattern_attr);
 	if (!pattern_attr)
 		goto err_pat;
 
@@ -964,11 +964,11 @@ struct vme_dma_attr *vme_dma_pci_attribute(dma_addr_t address)
 
 	/* XXX Run some sanity checks here */
 
-	attributes = kmalloc_obj(*attributes, GFP_KERNEL);
+	attributes = kmalloc_obj(*attributes);
 	if (!attributes)
 		goto err_attr;
 
-	pci_attr = kmalloc_obj(*pci_attr, GFP_KERNEL);
+	pci_attr = kmalloc_obj(*pci_attr);
 	if (!pci_attr)
 		goto err_pci;
 
@@ -1005,11 +1005,11 @@ struct vme_dma_attr *vme_dma_vme_attribute(unsigned long long address,
 	struct vme_dma_attr *attributes;
 	struct vme_dma_vme *vme_attr;
 
-	attributes = kmalloc_obj(*attributes, GFP_KERNEL);
+	attributes = kmalloc_obj(*attributes);
 	if (!attributes)
 		goto err_attr;
 
-	vme_attr = kmalloc_obj(*vme_attr, GFP_KERNEL);
+	vme_attr = kmalloc_obj(*vme_attr);
 	if (!vme_attr)
 		goto err_vme;
 
@@ -1458,7 +1458,7 @@ struct vme_resource *vme_lm_request(struct vme_dev *vdev)
 	if (!allocated_lm)
 		goto err_lm;
 
-	resource = kmalloc_obj(*resource, GFP_KERNEL);
+	resource = kmalloc_obj(*resource);
 	if (!resource)
 		goto err_alloc;
 
@@ -1810,7 +1810,7 @@ static int __vme_register_driver_bus(struct vme_driver *drv,
 	struct vme_dev *tmp;
 
 	for (i = 0; i < ndevs; i++) {
-		vdev = kzalloc_obj(*vdev, GFP_KERNEL);
+		vdev = kzalloc_obj(*vdev);
 		if (!vdev) {
 			err = -ENOMEM;
 			goto err_devalloc;
diff --git a/drivers/staging/vme_user/vme_fake.c b/drivers/staging/vme_user/vme_fake.c
index 77881a96114f..be4ad47ed526 100644
--- a/drivers/staging/vme_user/vme_fake.c
+++ b/drivers/staging/vme_user/vme_fake.c
@@ -1073,13 +1073,13 @@ static int __init fake_init(void)
 	/* If we want to support more than one bridge at some point, we need to
 	 * dynamically allocate this so we get one per device.
 	 */
-	fake_bridge = kzalloc_obj(*fake_bridge, GFP_KERNEL);
+	fake_bridge = kzalloc_obj(*fake_bridge);
 	if (!fake_bridge) {
 		retval = -ENOMEM;
 		goto err_struct;
 	}
 
-	fake_device = kzalloc_obj(*fake_device, GFP_KERNEL);
+	fake_device = kzalloc_obj(*fake_device);
 	if (!fake_device) {
 		retval = -ENOMEM;
 		goto err_driver;
@@ -1102,7 +1102,7 @@ static int __init fake_init(void)
 	/* Add master windows to list */
 	INIT_LIST_HEAD(&fake_bridge->master_resources);
 	for (i = 0; i < FAKE_MAX_MASTER; i++) {
-		master_image = kmalloc_obj(*master_image, GFP_KERNEL);
+		master_image = kmalloc_obj(*master_image);
 		if (!master_image) {
 			retval = -ENOMEM;
 			goto err_master;
@@ -1128,7 +1128,7 @@ static int __init fake_init(void)
 	/* Add slave windows to list */
 	INIT_LIST_HEAD(&fake_bridge->slave_resources);
 	for (i = 0; i < FAKE_MAX_SLAVE; i++) {
-		slave_image = kmalloc_obj(*slave_image, GFP_KERNEL);
+		slave_image = kmalloc_obj(*slave_image);
 		if (!slave_image) {
 			retval = -ENOMEM;
 			goto err_slave;
@@ -1150,7 +1150,7 @@ static int __init fake_init(void)
 
 	/* Add location monitor to list */
 	INIT_LIST_HEAD(&fake_bridge->lm_resources);
-	lm = kmalloc_obj(*lm, GFP_KERNEL);
+	lm = kmalloc_obj(*lm);
 	if (!lm) {
 		retval = -ENOMEM;
 		goto err_lm;
diff --git a/drivers/staging/vme_user/vme_tsi148.c b/drivers/staging/vme_user/vme_tsi148.c
index 123408fffb6f..356f3f5ec69a 100644
--- a/drivers/staging/vme_user/vme_tsi148.c
+++ b/drivers/staging/vme_user/vme_tsi148.c
@@ -1611,7 +1611,7 @@ static int tsi148_dma_list_add(struct vme_dma_list *list, struct vme_dma_attr *s
 	tsi148_bridge = list->parent->parent;
 
 	/* Descriptor must be aligned on 64-bit boundaries */
-	entry = kmalloc_obj(*entry, GFP_KERNEL);
+	entry = kmalloc_obj(*entry);
 	if (!entry) {
 		retval = -ENOMEM;
 		goto err_mem;
@@ -2260,14 +2260,14 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	/* If we want to support more than one of each bridge, we need to
 	 * dynamically generate this so we get one per device
 	 */
-	tsi148_bridge = kzalloc_obj(*tsi148_bridge, GFP_KERNEL);
+	tsi148_bridge = kzalloc_obj(*tsi148_bridge);
 	if (!tsi148_bridge) {
 		retval = -ENOMEM;
 		goto err_struct;
 	}
 	vme_init_bridge(tsi148_bridge);
 
-	tsi148_device = kzalloc_obj(*tsi148_device, GFP_KERNEL);
+	tsi148_device = kzalloc_obj(*tsi148_device);
 	if (!tsi148_device) {
 		retval = -ENOMEM;
 		goto err_driver;
@@ -2349,7 +2349,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
 	/* Add master windows to list */
 	for (i = 0; i < master_num; i++) {
-		master_image = kmalloc_obj(*master_image, GFP_KERNEL);
+		master_image = kmalloc_obj(*master_image);
 		if (!master_image) {
 			retval = -ENOMEM;
 			goto err_master;
@@ -2375,7 +2375,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
 	/* Add slave windows to list */
 	for (i = 0; i < TSI148_MAX_SLAVE; i++) {
-		slave_image = kmalloc_obj(*slave_image, GFP_KERNEL);
+		slave_image = kmalloc_obj(*slave_image);
 		if (!slave_image) {
 			retval = -ENOMEM;
 			goto err_slave;
@@ -2396,7 +2396,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
 	/* Add dma engines to list */
 	for (i = 0; i < TSI148_MAX_DMA; i++) {
-		dma_ctrlr = kmalloc_obj(*dma_ctrlr, GFP_KERNEL);
+		dma_ctrlr = kmalloc_obj(*dma_ctrlr);
 		if (!dma_ctrlr) {
 			retval = -ENOMEM;
 			goto err_dma;
@@ -2416,7 +2416,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	}
 
 	/* Add location monitor to list */
-	lm = kmalloc_obj(*lm, GFP_KERNEL);
+	lm = kmalloc_obj(*lm);
 	if (!lm) {
 		retval = -ENOMEM;
 		goto err_lm;
diff --git a/drivers/staging/vme_user/vme_user.c b/drivers/staging/vme_user/vme_user.c
index 00da869a8056..d95dd7d9190a 100644
--- a/drivers/staging/vme_user/vme_user.c
+++ b/drivers/staging/vme_user/vme_user.c
@@ -464,7 +464,7 @@ static int vme_user_master_mmap(unsigned int minor, struct vm_area_struct *vma)
 		return err;
 	}
 
-	vma_priv = kmalloc_obj(*vma_priv, GFP_KERNEL);
+	vma_priv = kmalloc_obj(*vma_priv);
 	if (!vma_priv) {
 		mutex_unlock(&image[minor].mutex);
 		return -ENOMEM;