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>

56 files changed, 93 insertions, 93 deletions

diff --git a/drivers/platform/arm64/huawei-gaokun-ec.c b/drivers/platform/arm64/huawei-gaokun-ec.c
index 23a727bb230c..a83ddc20b5a3 100644
--- a/drivers/platform/arm64/huawei-gaokun-ec.c
+++ b/drivers/platform/arm64/huawei-gaokun-ec.c
@@ -680,7 +680,7 @@ static int gaokun_aux_init(struct device *parent, const char *name,
 	struct auxiliary_device *adev;
 	int ret;
 
-	adev = kzalloc_obj(*adev, GFP_KERNEL);
+	adev = kzalloc_obj(*adev);
 	if (!adev)
 		return -ENOMEM;
 
diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
index 7a019827afa5..042f8ca6a463 100644
--- a/drivers/platform/chrome/chromeos_laptop.c
+++ b/drivers/platform/chrome/chromeos_laptop.c
@@ -880,7 +880,7 @@ chromeos_laptop_prepare(const struct chromeos_laptop *src)
 	struct chromeos_laptop *cros_laptop;
 	int error;
 
-	cros_laptop = kzalloc_obj(*cros_laptop, GFP_KERNEL);
+	cros_laptop = kzalloc_obj(*cros_laptop);
 	if (!cros_laptop)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/platform/chrome/cros_ec_chardev.c b/drivers/platform/chrome/cros_ec_chardev.c
index a2c919caa220..002be3352100 100644
--- a/drivers/platform/chrome/cros_ec_chardev.c
+++ b/drivers/platform/chrome/cros_ec_chardev.c
@@ -162,7 +162,7 @@ static int cros_ec_chardev_open(struct inode *inode, struct file *filp)
 	struct chardev_priv *priv;
 	int ret;
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return -ENOMEM;
 
diff --git a/drivers/platform/chrome/wilco_ec/event.c b/drivers/platform/chrome/wilco_ec/event.c
index e7f85d6f29f1..3a7ef8e0e0f4 100644
--- a/drivers/platform/chrome/wilco_ec/event.c
+++ b/drivers/platform/chrome/wilco_ec/event.c
@@ -457,7 +457,7 @@ static int event_device_add(struct acpi_device *adev)
 		return error;
 	}
 
-	dev_data = kzalloc_obj(*dev_data, GFP_KERNEL);
+	dev_data = kzalloc_obj(*dev_data);
 	if (!dev_data) {
 		error = -ENOMEM;
 		goto free_minor;
diff --git a/drivers/platform/chrome/wilco_ec/telemetry.c b/drivers/platform/chrome/wilco_ec/telemetry.c
index 6375bbb6d6ce..cadb68fa0a40 100644
--- a/drivers/platform/chrome/wilco_ec/telemetry.c
+++ b/drivers/platform/chrome/wilco_ec/telemetry.c
@@ -248,7 +248,7 @@ static int telem_open(struct inode *inode, struct file *filp)
 
 	get_device(&dev_data->dev);
 
-	sess_data = kzalloc_obj(*sess_data, GFP_KERNEL);
+	sess_data = kzalloc_obj(*sess_data);
 	if (!sess_data) {
 		atomic_set(&dev_data->available, 1);
 		return -ENOMEM;
@@ -370,7 +370,7 @@ static int telem_device_probe(struct platform_device *pdev)
 		return error;
 	}
 
-	dev_data = kzalloc_obj(*dev_data, GFP_KERNEL);
+	dev_data = kzalloc_obj(*dev_data);
 	if (!dev_data) {
 		ida_free(&telem_ida, minor);
 		return -ENOMEM;
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index 370259ef3bfe..75c86f5688c9 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -699,7 +699,7 @@ static int goldfish_pipe_open(struct inode *inode, struct file *file)
 	int status;
 
 	/* Allocate new pipe kernel object */
-	struct goldfish_pipe *pipe = kzalloc_obj(*pipe, GFP_KERNEL);
+	struct goldfish_pipe *pipe = kzalloc_obj(*pipe);
 
 	if (!pipe)
 		return -ENOMEM;
@@ -826,7 +826,7 @@ static int goldfish_pipe_device_init(struct platform_device *pdev,
 	dev->pdev_dev = &pdev->dev;
 	dev->first_signalled_pipe = NULL;
 	dev->pipes_capacity = INITIAL_PIPES_CAPACITY;
-	dev->pipes = kzalloc_objs(*dev->pipes, dev->pipes_capacity, GFP_KERNEL);
+	dev->pipes = kzalloc_objs(*dev->pipes, dev->pipes_capacity);
 	if (!dev->pipes) {
 		misc_deregister(&dev->miscdev);
 		return -ENOMEM;
diff --git a/drivers/platform/mellanox/mlxbf-tmfifo.c b/drivers/platform/mellanox/mlxbf-tmfifo.c
index 7fea80d3220c..3c6408581373 100644
--- a/drivers/platform/mellanox/mlxbf-tmfifo.c
+++ b/drivers/platform/mellanox/mlxbf-tmfifo.c
@@ -1203,7 +1203,7 @@ static int mlxbf_tmfifo_create_vdev(struct device *dev,
 		goto fail;
 	}
 
-	tm_vdev = kzalloc_obj(*tm_vdev, GFP_KERNEL);
+	tm_vdev = kzalloc_obj(*tm_vdev);
 	if (!tm_vdev) {
 		ret = -ENOMEM;
 		goto fail;
diff --git a/drivers/platform/olpc/olpc-ec.c b/drivers/platform/olpc/olpc-ec.c
index 6a6f94ee93f4..4a2d36f7331e 100644
--- a/drivers/platform/olpc/olpc-ec.c
+++ b/drivers/platform/olpc/olpc-ec.c
@@ -408,7 +408,7 @@ static int olpc_ec_probe(struct platform_device *pdev)
 	if (!ec_driver)
 		return -ENODEV;
 
-	ec = kzalloc_obj(*ec, GFP_KERNEL);
+	ec = kzalloc_obj(*ec);
 	if (!ec)
 		return -ENOMEM;
 
diff --git a/drivers/platform/raspberrypi/vchiq-interface/vchiq_arm.c b/drivers/platform/raspberrypi/vchiq-interface/vchiq_arm.c
index 1e72dc819e2a..e78641703252 100644
--- a/drivers/platform/raspberrypi/vchiq-interface/vchiq_arm.c
+++ b/drivers/platform/raspberrypi/vchiq-interface/vchiq_arm.c
@@ -358,7 +358,7 @@ int vchiq_initialise(struct vchiq_state *state, struct vchiq_instance **instance
 			 __func__, i);
 	}
 
-	instance = kzalloc_obj(*instance, GFP_KERNEL);
+	instance = kzalloc_obj(*instance);
 	if (!instance) {
 		ret = -ENOMEM;
 		goto failed;
@@ -618,7 +618,7 @@ vchiq_blocking_bulk_transfer(struct vchiq_instance *instance, unsigned int handl
 			}
 		}
 	} else {
-		waiter = kzalloc_obj(*waiter, GFP_KERNEL);
+		waiter = kzalloc_obj(*waiter);
 		if (!waiter)
 			return -ENOMEM;
 	}
@@ -1249,7 +1249,7 @@ vchiq_dump_service_use_state(struct vchiq_state *state)
 	if (!arm_state)
 		return;
 
-	service_data = kmalloc_objs(*service_data, MAX_SERVICES, GFP_KERNEL);
+	service_data = kmalloc_objs(*service_data, MAX_SERVICES);
 	if (!service_data)
 		return;
 
diff --git a/drivers/platform/raspberrypi/vchiq-interface/vchiq_bus.c b/drivers/platform/raspberrypi/vchiq-interface/vchiq_bus.c
index 616e05a36918..011105f1318d 100644
--- a/drivers/platform/raspberrypi/vchiq-interface/vchiq_bus.c
+++ b/drivers/platform/raspberrypi/vchiq-interface/vchiq_bus.c
@@ -68,7 +68,7 @@ vchiq_device_register(struct device *parent, const char *name)
 	struct vchiq_device *device;
 	int ret;
 
-	device = kzalloc_obj(*device, GFP_KERNEL);
+	device = kzalloc_obj(*device);
 	if (!device)
 		return NULL;
 
diff --git a/drivers/platform/raspberrypi/vchiq-interface/vchiq_core.c b/drivers/platform/raspberrypi/vchiq-interface/vchiq_core.c
index 1dac7d1ffaa2..48d6b1d74329 100644
--- a/drivers/platform/raspberrypi/vchiq-interface/vchiq_core.c
+++ b/drivers/platform/raspberrypi/vchiq-interface/vchiq_core.c
@@ -2723,7 +2723,7 @@ vchiq_add_service_internal(struct vchiq_state *state,
 	if (ret)
 		return NULL;
 
-	service = kzalloc_obj(*service, GFP_KERNEL);
+	service = kzalloc_obj(*service);
 	if (!service)
 		return service;
 
diff --git a/drivers/platform/raspberrypi/vchiq-interface/vchiq_dev.c b/drivers/platform/raspberrypi/vchiq-interface/vchiq_dev.c
index 18bcb8c133d1..f1c9c0d4b96a 100644
--- a/drivers/platform/raspberrypi/vchiq-interface/vchiq_dev.c
+++ b/drivers/platform/raspberrypi/vchiq-interface/vchiq_dev.c
@@ -149,7 +149,7 @@ static int vchiq_ioc_create_service(struct vchiq_instance *instance,
 	if (args->is_open && !instance->connected)
 		return -ENOTCONN;
 
-	user_service = kmalloc_obj(*user_service, GFP_KERNEL);
+	user_service = kmalloc_obj(*user_service);
 	if (!user_service)
 		return -ENOMEM;
 
@@ -298,7 +298,7 @@ static int vchiq_irq_queue_bulk_tx_rx(struct vchiq_instance *instance,
 		return -EINVAL;
 
 	if (args->mode == VCHIQ_BULK_MODE_BLOCKING) {
-		waiter = kzalloc_obj(*waiter, GFP_KERNEL);
+		waiter = kzalloc_obj(*waiter);
 		if (!waiter) {
 			ret = -ENOMEM;
 			goto out;
@@ -1185,7 +1185,7 @@ static int vchiq_open(struct inode *inode, struct file *file)
 		return -ENOTCONN;
 	}
 
-	instance = kzalloc_obj(*instance, GFP_KERNEL);
+	instance = kzalloc_obj(*instance);
 	if (!instance)
 		return -ENOMEM;
 
diff --git a/drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.c b/drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.c
index 79790867c45c..c89c16fb8b33 100644
--- a/drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.c
+++ b/drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.c
@@ -190,7 +190,7 @@ get_msg_context(struct vchiq_mmal_instance *instance)
 	int handle;
 
 	/* todo: should this be allocated from a pool to avoid kzalloc */
-	msg_context = kzalloc_obj(*msg_context, GFP_KERNEL);
+	msg_context = kzalloc_obj(*msg_context);
 
 	if (!msg_context)
 		return ERR_PTR(-ENOMEM);
@@ -1898,7 +1898,7 @@ int vchiq_mmal_init(struct device *dev, struct vchiq_mmal_instance **out_instanc
 		goto err_shutdown_vchiq;
 	}
 
-	instance = kzalloc_obj(*instance, GFP_KERNEL);
+	instance = kzalloc_obj(*instance);
 
 	if (!instance) {
 		err = -ENOMEM;
diff --git a/drivers/platform/surface/aggregator/bus.c b/drivers/platform/surface/aggregator/bus.c
index dba8ca379385..4395331be659 100644
--- a/drivers/platform/surface/aggregator/bus.c
+++ b/drivers/platform/surface/aggregator/bus.c
@@ -83,7 +83,7 @@ struct ssam_device *ssam_device_alloc(struct ssam_controller *ctrl,
 {
 	struct ssam_device *sdev;
 
-	sdev = kzalloc_obj(*sdev, GFP_KERNEL);
+	sdev = kzalloc_obj(*sdev);
 	if (!sdev)
 		return NULL;
 
diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c
index 5f1940a186a1..6a8430cb9cbf 100644
--- a/drivers/platform/surface/aggregator/controller.c
+++ b/drivers/platform/surface/aggregator/controller.c
@@ -344,7 +344,7 @@ ssam_nf_refcount_inc(struct ssam_nf *nf, struct ssam_event_registry reg,
 		}
 	}
 
-	entry = kzalloc_obj(*entry, GFP_KERNEL);
+	entry = kzalloc_obj(*entry);
 	if (!entry)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/platform/surface/aggregator/core.c b/drivers/platform/surface/aggregator/core.c
index 9349a1b14ab7..43d5988fb964 100644
--- a/drivers/platform/surface/aggregator/core.c
+++ b/drivers/platform/surface/aggregator/core.c
@@ -652,7 +652,7 @@ static int ssam_serial_hub_probe(struct serdev_device *serdev)
 	}
 
 	/* Allocate controller. */
-	ctrl = kzalloc_obj(*ctrl, GFP_KERNEL);
+	ctrl = kzalloc_obj(*ctrl);
 	if (!ctrl)
 		return -ENOMEM;
 
diff --git a/drivers/platform/surface/surface3_power.c b/drivers/platform/surface/surface3_power.c
index b00f52687fa4..94fdddc7f207 100644
--- a/drivers/platform/surface/surface3_power.c
+++ b/drivers/platform/surface/surface3_power.c
@@ -454,7 +454,7 @@ static int mshw0011_install_space_handler(struct i2c_client *client)
 	if (!adev)
 		return -ENODEV;
 
-	data = kzalloc_obj(struct mshw0011_handler_data, GFP_KERNEL);
+	data = kzalloc_obj(struct mshw0011_handler_data);
 	if (!data)
 		return -ENOMEM;
 
diff --git a/drivers/platform/surface/surface_aggregator_cdev.c b/drivers/platform/surface/surface_aggregator_cdev.c
index 2e4746c700c8..8929937ba9dc 100644
--- a/drivers/platform/surface/surface_aggregator_cdev.c
+++ b/drivers/platform/surface/surface_aggregator_cdev.c
@@ -154,7 +154,7 @@ static int ssam_cdev_notifier_register(struct ssam_cdev_client *client, u8 tc, i
 	}
 
 	/* Allocate new notifier. */
-	nf = kzalloc_obj(*nf, GFP_KERNEL);
+	nf = kzalloc_obj(*nf);
 	if (!nf) {
 		mutex_unlock(&client->notifier_lock);
 		return -ENOMEM;
@@ -685,7 +685,7 @@ static int ssam_dbg_device_probe(struct platform_device *pdev)
 	if (IS_ERR(ctrl))
 		return PTR_ERR(ctrl) == -ENODEV ? -EPROBE_DEFER : PTR_ERR(ctrl);
 
-	cdev = kzalloc_obj(*cdev, GFP_KERNEL);
+	cdev = kzalloc_obj(*cdev);
 	if (!cdev)
 		return -ENOMEM;
 
diff --git a/drivers/platform/surface/surface_dtx.c b/drivers/platform/surface/surface_dtx.c
index 43a8c23b2bf0..d6cd56970479 100644
--- a/drivers/platform/surface/surface_dtx.c
+++ b/drivers/platform/surface/surface_dtx.c
@@ -403,7 +403,7 @@ static int surface_dtx_open(struct inode *inode, struct file *file)
 	struct sdtx_client *client;
 
 	/* Initialize client. */
-	client = kzalloc_obj(*client, GFP_KERNEL);
+	client = kzalloc_obj(*client);
 	if (!client)
 		return -ENOMEM;
 
@@ -1044,7 +1044,7 @@ static struct sdtx_device *sdtx_device_create(struct device *dev, struct ssam_co
 	struct sdtx_device *ddev;
 	int status;
 
-	ddev = kzalloc_obj(*ddev, GFP_KERNEL);
+	ddev = kzalloc_obj(*ddev);
 	if (!ddev)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/platform/surface/surfacepro3_button.c b/drivers/platform/surface/surfacepro3_button.c
index 28386780177c..9bd39f09c7db 100644
--- a/drivers/platform/surface/surfacepro3_button.c
+++ b/drivers/platform/surface/surfacepro3_button.c
@@ -199,7 +199,7 @@ static int surface_button_add(struct acpi_device *device)
 	if (!surface_button_check_MSHW0040(device))
 		return -ENODEV;
 
-	button = kzalloc_obj(struct surface_button, GFP_KERNEL);
+	button = kzalloc_obj(struct surface_button);
 	if (!button)
 		return -ENOMEM;
 
diff --git a/drivers/platform/wmi/core.c b/drivers/platform/wmi/core.c
index de11edb40b04..b8e6b9a421c6 100644
--- a/drivers/platform/wmi/core.c
+++ b/drivers/platform/wmi/core.c
@@ -1296,7 +1296,7 @@ static int parse_wdg(struct device *wmi_bus_dev, struct platform_device *pdev)
 			continue;
 		}
 
-		wblock = kzalloc_obj(*wblock, GFP_KERNEL);
+		wblock = kzalloc_obj(*wblock);
 		if (!wblock)
 			continue;
 
diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c
index 83f4e96ecbc7..fbc30f1f8abd 100644
--- a/drivers/platform/x86/apple-gmux.c
+++ b/drivers/platform/x86/apple-gmux.c
@@ -799,7 +799,7 @@ static int gmux_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
 		return -ENODEV;
 	}
 
-	gmux_data = kzalloc_obj(*gmux_data, GFP_KERNEL);
+	gmux_data = kzalloc_obj(*gmux_data);
 	if (!gmux_data)
 		return -ENOMEM;
 	pnp_set_drvdata(pnp, gmux_data);
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 2b85315b7bd5..d96f6af26ff7 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -1831,7 +1831,7 @@ static int asus_acpi_add(struct acpi_device *device)
 
 	pr_notice("Asus Laptop Support version %s\n",
 		  ASUS_LAPTOP_VERSION);
-	asus = kzalloc_obj(struct asus_laptop, GFP_KERNEL);
+	asus = kzalloc_obj(struct asus_laptop);
 	if (!asus)
 		return -ENOMEM;
 	asus->handle = device->handle;
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 93905860fe07..7c0915e097ba 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -5014,7 +5014,7 @@ static int asus_wmi_add(struct platform_device *pdev)
 	int err;
 	u32 result;
 
-	asus = kzalloc_obj(struct asus_wmi, GFP_KERNEL);
+	asus = kzalloc_obj(struct asus_wmi);
 	if (!asus)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/classmate-laptop.c b/drivers/platform/x86/classmate-laptop.c
index bc9e26b94c84..e6eed3d65580 100644
--- a/drivers/platform/x86/classmate-laptop.c
+++ b/drivers/platform/x86/classmate-laptop.c
@@ -400,7 +400,7 @@ static int cmpc_accel_add_v4(struct acpi_device *acpi)
 	struct input_dev *inputdev;
 	struct cmpc_accel *accel;
 
-	accel = kmalloc_obj(*accel, GFP_KERNEL);
+	accel = kmalloc_obj(*accel);
 	if (!accel)
 		return -ENOMEM;
 
@@ -650,7 +650,7 @@ static int cmpc_accel_add(struct acpi_device *acpi)
 	struct input_dev *inputdev;
 	struct cmpc_accel *accel;
 
-	accel = kmalloc_obj(*accel, GFP_KERNEL);
+	accel = kmalloc_obj(*accel);
 	if (!accel)
 		return -ENOMEM;
 
@@ -964,7 +964,7 @@ static int cmpc_ipml_add(struct acpi_device *acpi)
 	struct ipml200_dev *ipml;
 	struct backlight_properties props;
 
-	ipml = kmalloc_obj(*ipml, GFP_KERNEL);
+	ipml = kmalloc_obj(*ipml);
 	if (ipml == NULL)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/dell/dell-smbios-base.c b/drivers/platform/x86/dell/dell-smbios-base.c
index dd011e252713..564ff5279797 100644
--- a/drivers/platform/x86/dell/dell-smbios-base.c
+++ b/drivers/platform/x86/dell/dell-smbios-base.c
@@ -495,7 +495,7 @@ static int build_tokens_sysfs(struct platform_device *dev)
 	int ret;
 	int i, j;
 
-	token_entries = kzalloc_objs(*token_entries, da_num_tokens, GFP_KERNEL);
+	token_entries = kzalloc_objs(*token_entries, da_num_tokens);
 	if (!token_entries)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/dell/dell-wmi-base.c b/drivers/platform/x86/dell/dell-wmi-base.c
index f2e63be75fb3..cdaa366b5e11 100644
--- a/drivers/platform/x86/dell/dell-wmi-base.c
+++ b/drivers/platform/x86/dell/dell-wmi-base.c
@@ -586,7 +586,7 @@ static void handle_dmi_entry(const struct dmi_header *dm, void *opaque)
 		return;
 	}
 
-	keymap = kzalloc_objs(struct key_entry, hotkey_num, GFP_KERNEL);
+	keymap = kzalloc_objs(struct key_entry, hotkey_num);
 	if (!keymap) {
 		results->err = -ENOMEM;
 		return;
@@ -769,7 +769,7 @@ static int dell_wmi_events_set_enabled(bool enable)
 	struct calling_interface_buffer *buffer;
 	int ret;
 
-	buffer = kzalloc_obj(struct calling_interface_buffer, GFP_KERNEL);
+	buffer = kzalloc_obj(struct calling_interface_buffer);
 	if (!buffer)
 		return -ENOMEM;
 	buffer->cmd_class = CLASS_INFO;
diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
index 577949ee2e23..9dddab6c9397 100644
--- a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
+++ b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
@@ -460,7 +460,7 @@ static int init_bios_attributes(int attr_type, const char *guid)
 		}
 
 		/* build attribute */
-		attr_name_kobj = kzalloc_obj(*attr_name_kobj, GFP_KERNEL);
+		attr_name_kobj = kzalloc_obj(*attr_name_kobj);
 		if (!attr_name_kobj) {
 			retval = -ENOMEM;
 			goto err_attr_init;
diff --git a/drivers/platform/x86/dell/dell_rbu.c b/drivers/platform/x86/dell/dell_rbu.c
index daf5df8cbafc..eb50f1d75d0c 100644
--- a/drivers/platform/x86/dell/dell_rbu.c
+++ b/drivers/platform/x86/dell/dell_rbu.c
@@ -111,7 +111,7 @@ static int create_packet(void *data, size_t length) __must_hold(&rbu_data.lock)
 
 	spin_unlock(&rbu_data.lock);
 
-	newpacket = kzalloc_obj(struct packet_data, GFP_KERNEL);
+	newpacket = kzalloc_obj(struct packet_data);
 
 	if (!newpacket) {
 		pr_warn("failed to allocate new packet\n");
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index e42045494b2c..974f55e0b36f 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -1366,7 +1366,7 @@ static int eeepc_acpi_add(struct acpi_device *device)
 	int result;
 
 	pr_notice(EEEPC_LAPTOP_NAME "\n");
-	eeepc = kzalloc_obj(struct eeepc_laptop, GFP_KERNEL);
+	eeepc = kzalloc_obj(struct eeepc_laptop);
 	if (!eeepc)
 		return -ENOMEM;
 	eeepc->handle = device->handle;
diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
index bf3d409e5974..27fd6cd21529 100644
--- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
+++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
@@ -588,7 +588,7 @@ static int hp_add_other_attributes(int attr_type)
 	int ret;
 	char *attr_name;
 
-	attr_name_kobj = kzalloc_obj(*attr_name_kobj, GFP_KERNEL);
+	attr_name_kobj = kzalloc_obj(*attr_name_kobj);
 	if (!attr_name_kobj)
 		return -ENOMEM;
 
@@ -711,7 +711,7 @@ static int hp_init_bios_package_attribute(enum hp_wmi_data_type attr_type,
 	}
 
 	/* build attribute */
-	attr_name_kobj = kzalloc_obj(*attr_name_kobj, GFP_KERNEL);
+	attr_name_kobj = kzalloc_obj(*attr_name_kobj);
 	if (!attr_name_kobj) {
 		ret = -ENOMEM;
 		goto pack_attr_exit;
@@ -810,7 +810,7 @@ static int hp_init_bios_buffer_attribute(enum hp_wmi_data_type attr_type,
 	}
 
 	/* build attribute */
-	attr_name_kobj = kzalloc_obj(*attr_name_kobj, GFP_KERNEL);
+	attr_name_kobj = kzalloc_obj(*attr_name_kobj);
 	if (!attr_name_kobj) {
 		ret = -ENOMEM;
 		goto buff_attr_exit;
diff --git a/drivers/platform/x86/huawei-wmi.c b/drivers/platform/x86/huawei-wmi.c
index 64c5543f795d..93cca17fdf58 100644
--- a/drivers/platform/x86/huawei-wmi.c
+++ b/drivers/platform/x86/huawei-wmi.c
@@ -854,7 +854,7 @@ static __init int huawei_wmi_init(void)
 	struct platform_device *pdev;
 	int err;
 
-	huawei_wmi = kzalloc_obj(struct huawei_wmi, GFP_KERNEL);
+	huawei_wmi = kzalloc_obj(struct huawei_wmi);
 	if (!huawei_wmi)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/intel/ifs/core.c b/drivers/platform/x86/intel/ifs/core.c
index 1f4f84217d5e..3dafa28a1010 100644
--- a/drivers/platform/x86/intel/ifs/core.c
+++ b/drivers/platform/x86/intel/ifs/core.c
@@ -125,7 +125,7 @@ static int __init ifs_init(void)
 	if (rdmsrq_safe(MSR_INTEGRITY_CAPS, &msrval))
 		return -ENODEV;
 
-	ifs_pkg_auth = kmalloc_objs(bool, topology_max_packages(), GFP_KERNEL);
+	ifs_pkg_auth = kmalloc_objs(bool, topology_max_packages());
 	if (!ifs_pkg_auth)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/intel/int1092/intel_sar.c b/drivers/platform/x86/intel/int1092/intel_sar.c
index 568a2722477b..fb26e5a26ffa 100644
--- a/drivers/platform/x86/intel/int1092/intel_sar.c
+++ b/drivers/platform/x86/intel/int1092/intel_sar.c
@@ -248,7 +248,7 @@ static int sar_probe(struct platform_device *device)
 	int reg;
 	int result;
 
-	context = kzalloc_obj(*context, GFP_KERNEL);
+	context = kzalloc_obj(*context);
 	if (!context)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/intel/pmc/pltdrv.c b/drivers/platform/x86/intel/pmc/pltdrv.c
index 6fcf0f85a8d7..71ebb9ea1be2 100644
--- a/drivers/platform/x86/intel/pmc/pltdrv.c
+++ b/drivers/platform/x86/intel/pmc/pltdrv.c
@@ -65,7 +65,7 @@ static int __init pmc_core_platform_init(void)
 	if (!x86_match_cpu(intel_pmc_core_platform_ids))
 		return -ENODEV;
 
-	pmc_core_device = kzalloc_obj(*pmc_core_device, GFP_KERNEL);
+	pmc_core_device = kzalloc_obj(*pmc_core_device);
 	if (!pmc_core_device)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/intel/pmt/telemetry.c b/drivers/platform/x86/intel/pmt/telemetry.c
index 2eee7389dcf9..a52803bfe124 100644
--- a/drivers/platform/x86/intel/pmt/telemetry.c
+++ b/drivers/platform/x86/intel/pmt/telemetry.c
@@ -107,7 +107,7 @@ static int pmt_telem_add_endpoint(struct intel_vsec_device *ivdev,
 	struct telem_endpoint *ep;
 
 	/* Endpoint lifetimes are managed by kref, not devres */
-	entry->ep = kzalloc_obj(*(entry->ep), GFP_KERNEL);
+	entry->ep = kzalloc_obj(*(entry->ep));
 	if (!entry->ep)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
index 33abff1dbe84..fa75eb77e0cb 100644
--- a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
+++ b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
@@ -89,7 +89,7 @@ static int isst_store_new_cmd(int cmd, u32 cpu, int mbox_cmd_type, u32 param,
 {
 	struct isst_cmd *sst_cmd;
 
-	sst_cmd = kmalloc_obj(*sst_cmd, GFP_KERNEL);
+	sst_cmd = kmalloc_obj(*sst_cmd);
 	if (!sst_cmd)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c b/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
index 9242e29aac59..a38c278a792b 100644
--- a/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
+++ b/drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c
@@ -1603,7 +1603,7 @@ int tpmi_sst_dev_add(struct auxiliary_device *auxdev)
 		 * devm_* allocation here as each partition is a
 		 * different device, which can be unbound.
 		 */
-		tpmi_sst = kzalloc_obj(*tpmi_sst, GFP_KERNEL);
+		tpmi_sst = kzalloc_obj(*tpmi_sst);
 		if (!tpmi_sst) {
 			ret = -ENOMEM;
 			goto unlock_exit;
diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
index b21a9cfabad4..5059d320edf8 100644
--- a/drivers/platform/x86/intel/vsec.c
+++ b/drivers/platform/x86/intel/vsec.c
@@ -299,11 +299,11 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he
 		return -EINVAL;
 	}
 
-	intel_vsec_dev = kzalloc_obj(*intel_vsec_dev, GFP_KERNEL);
+	intel_vsec_dev = kzalloc_obj(*intel_vsec_dev);
 	if (!intel_vsec_dev)
 		return -ENOMEM;
 
-	res = kzalloc_objs(*res, header->num_entries, GFP_KERNEL);
+	res = kzalloc_objs(*res, header->num_entries);
 	if (!res)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/intel/vsec_tpmi.c b/drivers/platform/x86/intel/vsec_tpmi.c
index 9614fb8584f2..98846e88d3d0 100644
--- a/drivers/platform/x86/intel/vsec_tpmi.c
+++ b/drivers/platform/x86/intel/vsec_tpmi.c
@@ -622,11 +622,11 @@ static int tpmi_create_device(struct intel_tpmi_info *tpmi_info,
 	if (!name)
 		return -EOPNOTSUPP;
 
-	res = kzalloc_objs(*res, pfs->pfs_header.num_entries, GFP_KERNEL);
+	res = kzalloc_objs(*res, pfs->pfs_header.num_entries);
 	if (!res)
 		return -ENOMEM;
 
-	feature_vsec_dev = kzalloc_obj(*feature_vsec_dev, GFP_KERNEL);
+	feature_vsec_dev = kzalloc_obj(*feature_vsec_dev);
 	if (!feature_vsec_dev) {
 		kfree(res);
 		return -ENOMEM;
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index 4412e7c2bce0..a2472ad10f37 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -573,7 +573,7 @@ __intel_scu_ipc_register(struct device *parent,
 	if (ipcdev)
 		return ERR_PTR(-EBUSY);
 
-	scu = kzalloc_obj(*scu, GFP_KERNEL);
+	scu = kzalloc_obj(*scu);
 	if (!scu)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/platform/x86/lenovo/ideapad-laptop.c b/drivers/platform/x86/lenovo/ideapad-laptop.c
index 59703574e8ce..ae1ebb071fab 100644
--- a/drivers/platform/x86/lenovo/ideapad-laptop.c
+++ b/drivers/platform/x86/lenovo/ideapad-laptop.c
@@ -1172,7 +1172,7 @@ static int ideapad_dytc_profile_init(struct ideapad_private *priv)
 		return -ENODEV;
 	}
 
-	priv->dytc = kzalloc_obj(*priv->dytc, GFP_KERNEL);
+	priv->dytc = kzalloc_obj(*priv->dytc);
 	if (!priv->dytc)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/lenovo/think-lmi.c b/drivers/platform/x86/lenovo/think-lmi.c
index a89f9436a795..e215e86e3db7 100644
--- a/drivers/platform/x86/lenovo/think-lmi.c
+++ b/drivers/platform/x86/lenovo/think-lmi.c
@@ -1593,7 +1593,7 @@ static struct tlmi_pwd_setting *tlmi_create_auth(const char *pwd_type,
 {
 	struct tlmi_pwd_setting *new_pwd;
 
-	new_pwd = kzalloc_obj(struct tlmi_pwd_setting, GFP_KERNEL);
+	new_pwd = kzalloc_obj(struct tlmi_pwd_setting);
 	if (!new_pwd)
 		return NULL;
 
@@ -1668,7 +1668,7 @@ static int tlmi_analyze(struct wmi_device *wdev)
 		strreplace(item, ',', '\0');
 
 		/* Create a setting entry */
-		setting = kzalloc_obj(*setting, GFP_KERNEL);
+		setting = kzalloc_obj(*setting);
 		if (!setting) {
 			ret = -ENOMEM;
 			kfree(item);
diff --git a/drivers/platform/x86/lenovo/thinkpad_acpi.c b/drivers/platform/x86/lenovo/thinkpad_acpi.c
index 9a5b1d793cb9..f9c736777908 100644
--- a/drivers/platform/x86/lenovo/thinkpad_acpi.c
+++ b/drivers/platform/x86/lenovo/thinkpad_acpi.c
@@ -873,7 +873,7 @@ static int __init register_tpacpi_subdriver(struct ibm_struct *ibm)
 
 	BUG_ON(!ibm->acpi);
 
-	ibm->acpi->driver = kzalloc_obj(struct acpi_driver, GFP_KERNEL);
+	ibm->acpi->driver = kzalloc_obj(struct acpi_driver);
 	if (!ibm->acpi->driver) {
 		pr_err("failed to allocate memory for ibm->acpi->driver\n");
 		return -ENOMEM;
@@ -1197,7 +1197,7 @@ static int __init tpacpi_new_rfkill(const enum tpacpi_rfk_id id,
 
 	BUG_ON(id >= TPACPI_RFK_SW_MAX || tpacpi_rfkill_switches[id]);
 
-	atp_rfk = kzalloc_obj(struct tpacpi_rfk, GFP_KERNEL);
+	atp_rfk = kzalloc_obj(struct tpacpi_rfk);
 	if (atp_rfk)
 		atp_rfk->rfkill = rfkill_alloc(name,
 						&tpacpi_pdev->dev,
@@ -5817,7 +5817,7 @@ static int __init led_init(struct ibm_init_struct *iibm)
 	if (led_supported == TPACPI_LED_NONE)
 		return -ENODEV;
 
-	tpacpi_leds = kzalloc_objs(*tpacpi_leds, TPACPI_LED_NUMLEDS, GFP_KERNEL);
+	tpacpi_leds = kzalloc_objs(*tpacpi_leds, TPACPI_LED_NUMLEDS);
 	if (!tpacpi_leds) {
 		pr_err("Out of memory for LED data\n");
 		return -ENOMEM;
diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
index 9990f6b920c5..d923ddaa4849 100644
--- a/drivers/platform/x86/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
@@ -1017,7 +1017,7 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device)
 	 */
 	num_sifr++;
 
-	pcc = kzalloc_obj(struct pcc_acpi, GFP_KERNEL);
+	pcc = kzalloc_obj(struct pcc_acpi);
 	if (!pcc) {
 		pr_err("Couldn't allocate mem for pcc");
 		return -ENOMEM;
diff --git a/drivers/platform/x86/pmc_atom.c b/drivers/platform/x86/pmc_atom.c
index 3b6edd709543..48c2a0e59d18 100644
--- a/drivers/platform/x86/pmc_atom.c
+++ b/drivers/platform/x86/pmc_atom.c
@@ -428,7 +428,7 @@ static int pmc_setup_clks(struct pci_dev *pdev, void __iomem *pmc_regmap,
 	struct platform_device *clkdev;
 	struct pmc_clk_data *clk_data;
 
-	clk_data = kzalloc_obj(*clk_data, GFP_KERNEL);
+	clk_data = kzalloc_obj(*clk_data);
 	if (!clk_data)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
index 50e337a85135..710f3d5bf84c 100644
--- a/drivers/platform/x86/samsung-laptop.c
+++ b/drivers/platform/x86/samsung-laptop.c
@@ -1671,7 +1671,7 @@ static int __init samsung_init(void)
 	if (!force && !dmi_check_system(samsung_dmi_table))
 		return -ENODEV;
 
-	samsung = kzalloc_obj(*samsung, GFP_KERNEL);
+	samsung = kzalloc_obj(*samsung);
 	if (!samsung)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index a670473b20ab..477f56385e54 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -829,7 +829,7 @@ static int sony_nc_handles_setup(struct platform_device *pd)
 {
 	int i, r, result, arg;
 
-	handles = kzalloc_obj(*handles, GFP_KERNEL);
+	handles = kzalloc_obj(*handles);
 	if (!handles)
 		return -ENOMEM;
 
@@ -1902,7 +1902,7 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd,
 		}
 	}
 
-	kbdbl_ctl = kzalloc_obj(*kbdbl_ctl, GFP_KERNEL);
+	kbdbl_ctl = kzalloc_obj(*kbdbl_ctl);
 	if (!kbdbl_ctl)
 		return -ENOMEM;
 
@@ -2070,7 +2070,7 @@ static int sony_nc_battery_care_setup(struct platform_device *pd,
 {
 	int ret = 0;
 
-	bcare_ctl = kzalloc_obj(struct battery_care_control, GFP_KERNEL);
+	bcare_ctl = kzalloc_obj(struct battery_care_control);
 	if (!bcare_ctl)
 		return -ENOMEM;
 
@@ -2222,7 +2222,7 @@ static ssize_t sony_nc_thermal_mode_show(struct device *dev,
 static int sony_nc_thermal_setup(struct platform_device *pd)
 {
 	int ret = 0;
-	th_handle = kzalloc_obj(struct snc_thermal_ctrl, GFP_KERNEL);
+	th_handle = kzalloc_obj(struct snc_thermal_ctrl);
 	if (!th_handle)
 		return -ENOMEM;
 
@@ -2370,7 +2370,7 @@ static int sony_nc_lid_resume_setup(struct platform_device *pd,
 	if (sony_call_snc_handle(handle, 0x0000, &result))
 		return -EIO;
 
-	lid_ctl = kzalloc_obj(struct snc_lid_resume_control, GFP_KERNEL);
+	lid_ctl = kzalloc_obj(struct snc_lid_resume_control);
 	if (!lid_ctl)
 		return -ENOMEM;
 
@@ -2497,7 +2497,7 @@ static int sony_nc_gfx_switch_setup(struct platform_device *pd,
 {
 	unsigned int result;
 
-	gfxs_ctl = kzalloc_obj(struct snc_gfx_switch_control, GFP_KERNEL);
+	gfxs_ctl = kzalloc_obj(struct snc_gfx_switch_control);
 	if (!gfxs_ctl)
 		return -ENOMEM;
 
@@ -2576,7 +2576,7 @@ static int sony_nc_highspeed_charging_setup(struct platform_device *pd)
 		return 0;
 	}
 
-	hsc_handle = kzalloc_obj(struct device_attribute, GFP_KERNEL);
+	hsc_handle = kzalloc_obj(struct device_attribute);
 	if (!hsc_handle)
 		return -ENOMEM;
 
@@ -2642,7 +2642,7 @@ static int sony_nc_lowbatt_setup(struct platform_device *pd)
 {
 	unsigned int result;
 
-	lowbatt_handle = kzalloc_obj(struct device_attribute, GFP_KERNEL);
+	lowbatt_handle = kzalloc_obj(struct device_attribute);
 	if (!lowbatt_handle)
 		return -ENOMEM;
 
@@ -2719,11 +2719,11 @@ static int sony_nc_fanspeed_setup(struct platform_device *pd)
 {
 	unsigned int result;
 
-	fan_handle = kzalloc_obj(struct device_attribute, GFP_KERNEL);
+	fan_handle = kzalloc_obj(struct device_attribute);
 	if (!fan_handle)
 		return -ENOMEM;
 
-	hsf_handle = kzalloc_obj(struct device_attribute, GFP_KERNEL);
+	hsf_handle = kzalloc_obj(struct device_attribute);
 	if (!hsf_handle) {
 		result = -ENOMEM;
 		goto out_hsf_handle_alloc;
@@ -2823,7 +2823,7 @@ static int sony_nc_usb_charge_setup(struct platform_device *pd)
 		return 0;
 	}
 
-	uc_handle = kzalloc_obj(struct device_attribute, GFP_KERNEL);
+	uc_handle = kzalloc_obj(struct device_attribute);
 	if (!uc_handle)
 		return -ENOMEM;
 
@@ -2870,7 +2870,7 @@ static int sony_nc_panelid_setup(struct platform_device *pd)
 {
 	unsigned int result;
 
-	panel_handle = kzalloc_obj(struct device_attribute, GFP_KERNEL);
+	panel_handle = kzalloc_obj(struct device_attribute);
 	if (!panel_handle)
 		return -ENOMEM;
 
@@ -2925,7 +2925,7 @@ static int sony_nc_smart_conn_setup(struct platform_device *pd)
 {
 	unsigned int result;
 
-	sc_handle = kzalloc_obj(struct device_attribute, GFP_KERNEL);
+	sc_handle = kzalloc_obj(struct device_attribute);
 	if (!sc_handle)
 		return -ENOMEM;
 
@@ -2999,7 +2999,7 @@ static int sony_nc_touchpad_setup(struct platform_device *pd,
 {
 	int ret = 0;
 
-	tp_ctl = kzalloc_obj(struct touchpad_control, GFP_KERNEL);
+	tp_ctl = kzalloc_obj(struct touchpad_control);
 	if (!tp_ctl)
 		return -ENOMEM;
 
@@ -4192,7 +4192,7 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context)
 						p->interrupts[i]);
 					continue;
 				}
-				interrupt = kzalloc_obj(*interrupt, GFP_KERNEL);
+				interrupt = kzalloc_obj(*interrupt);
 				if (!interrupt)
 					return AE_ERROR;
 
diff --git a/drivers/platform/x86/topstar-laptop.c b/drivers/platform/x86/topstar-laptop.c
index 955021a0ffa4..a7b4b6c8e549 100644
--- a/drivers/platform/x86/topstar-laptop.c
+++ b/drivers/platform/x86/topstar-laptop.c
@@ -292,7 +292,7 @@ static int topstar_acpi_add(struct acpi_device *device)
 
 	dmi_check_system(topstar_dmi_ids);
 
-	topstar = kzalloc_obj(struct topstar_laptop, GFP_KERNEL);
+	topstar = kzalloc_obj(struct topstar_laptop);
 	if (!topstar)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 8e1773f44f64..18fb558115aa 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -3321,7 +3321,7 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev)
 		return -ENODEV;
 	}
 
-	dev = kzalloc_obj(*dev, GFP_KERNEL);
+	dev = kzalloc_obj(*dev);
 	if (!dev)
 		return -ENOMEM;
 	dev->acpi_dev = acpi_dev;
diff --git a/drivers/platform/x86/toshiba_bluetooth.c b/drivers/platform/x86/toshiba_bluetooth.c
index 6e71de0abca2..e587beef05b9 100644
--- a/drivers/platform/x86/toshiba_bluetooth.c
+++ b/drivers/platform/x86/toshiba_bluetooth.c
@@ -242,7 +242,7 @@ static int toshiba_bt_rfkill_add(struct acpi_device *device)
 
 	pr_info("Toshiba ACPI Bluetooth device driver\n");
 
-	bt_dev = kzalloc_obj(*bt_dev, GFP_KERNEL);
+	bt_dev = kzalloc_obj(*bt_dev);
 	if (!bt_dev)
 		return -ENOMEM;
 	bt_dev->acpi_dev = device;
diff --git a/drivers/platform/x86/uniwill/uniwill-acpi.c b/drivers/platform/x86/uniwill/uniwill-acpi.c
index bad9c030295f..fee93537aa43 100644
--- a/drivers/platform/x86/uniwill/uniwill-acpi.c
+++ b/drivers/platform/x86/uniwill/uniwill-acpi.c
@@ -1293,7 +1293,7 @@ static int uniwill_add_battery(struct power_supply *battery, struct acpi_battery
 	struct uniwill_battery_entry *entry;
 	int ret;
 
-	entry = kzalloc_obj(*entry, GFP_KERNEL);
+	entry = kzalloc_obj(*entry);
 	if (!entry)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/uv_sysfs.c b/drivers/platform/x86/uv_sysfs.c
index fa2e31151923..353f9c6ef214 100644
--- a/drivers/platform/x86/uv_sysfs.c
+++ b/drivers/platform/x86/uv_sysfs.c
@@ -242,14 +242,14 @@ static int uv_hubs_init(void)
 		goto err_enum_objs;
 	}
 
-	uv_hubs = kzalloc_objs(*uv_hubs, uv_bios_obj_cnt, GFP_KERNEL);
+	uv_hubs = kzalloc_objs(*uv_hubs, uv_bios_obj_cnt);
 	if (!uv_hubs) {
 		ret = -ENOMEM;
 		goto err_enum_objs;
 	}
 
 	for (i = 0; i < uv_bios_obj_cnt; i++) {
-		uv_hubs[i] = kzalloc_obj(*uv_hubs[i], GFP_KERNEL);
+		uv_hubs[i] = kzalloc_obj(*uv_hubs[i]);
 		if (!uv_hubs[i]) {
 			i--;
 			ret = -ENOMEM;
@@ -368,7 +368,7 @@ static int uv_ports_init(void)
 	s64 biosr;
 	int j = 0, k = 0, ret, sz;
 
-	port_buf = kzalloc_objs(*port_buf, uv_bios_obj_cnt, GFP_KERNEL);
+	port_buf = kzalloc_objs(*port_buf, uv_bios_obj_cnt);
 	if (!port_buf)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/wireless-hotkey.c b/drivers/platform/x86/wireless-hotkey.c
index bba55c634e2c..e5083c0e1515 100644
--- a/drivers/platform/x86/wireless-hotkey.c
+++ b/drivers/platform/x86/wireless-hotkey.c
@@ -91,7 +91,7 @@ static int wl_add(struct acpi_device *device)
 	struct wl_button *button;
 	int err;
 
-	button = kzalloc_obj(struct wl_button, GFP_KERNEL);
+	button = kzalloc_obj(struct wl_button);
 	if (!button)
 		return -ENOMEM;
 
diff --git a/drivers/platform/x86/x86-android-tablets/core.c b/drivers/platform/x86/x86-android-tablets/core.c
index 15a50ced6867..2656ecea2a2a 100644
--- a/drivers/platform/x86/x86-android-tablets/core.c
+++ b/drivers/platform/x86/x86-android-tablets/core.c
@@ -463,7 +463,7 @@ static __init int x86_android_tablet_probe(struct platform_device *pdev)
 		}
 	}
 
-	spi_devs = kzalloc_objs(*spi_devs, dev_info->spi_dev_count, GFP_KERNEL);
+	spi_devs = kzalloc_objs(*spi_devs, dev_info->spi_dev_count);
 	if (!spi_devs) {
 		x86_android_tablet_remove(pdev);
 		return -ENOMEM;
@@ -479,7 +479,7 @@ static __init int x86_android_tablet_probe(struct platform_device *pdev)
 	}
 
 	/* + 1 to make space for the (optional) gpio_keys_button platform device */
-	pdevs = kzalloc_objs(*pdevs, dev_info->pdev_count + 1, GFP_KERNEL);
+	pdevs = kzalloc_objs(*pdevs, dev_info->pdev_count + 1);
 	if (!pdevs) {
 		x86_android_tablet_remove(pdev);
 		return -ENOMEM;
@@ -495,7 +495,7 @@ static __init int x86_android_tablet_probe(struct platform_device *pdev)
 		}
 	}
 
-	serdevs = kzalloc_objs(*serdevs, dev_info->serdev_count, GFP_KERNEL);
+	serdevs = kzalloc_objs(*serdevs, dev_info->serdev_count);
 	if (!serdevs) {
 		x86_android_tablet_remove(pdev);
 		return -ENOMEM;
diff --git a/drivers/platform/x86/xo15-ebook.c b/drivers/platform/x86/xo15-ebook.c
index 6bc5cd2abfab..4d1b1b310cc5 100644
--- a/drivers/platform/x86/xo15-ebook.c
+++ b/drivers/platform/x86/xo15-ebook.c
@@ -86,7 +86,7 @@ static int ebook_switch_add(struct acpi_device *device)
 	struct input_dev *input;
 	int error;
 
-	button = kzalloc_obj(struct ebook_switch, GFP_KERNEL);
+	button = kzalloc_obj(struct ebook_switch);
 	if (!button)
 		return -ENOMEM;