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>

30 files changed, 52 insertions, 52 deletions

diff --git a/drivers/firmware/arm_ffa/bus.c b/drivers/firmware/arm_ffa/bus.c
index fbd9af875a69..9576862d89c4 100644
--- a/drivers/firmware/arm_ffa/bus.c
+++ b/drivers/firmware/arm_ffa/bus.c
@@ -203,7 +203,7 @@ ffa_device_register(const struct ffa_partition_info *part_info,
 	if (id < 0)
 		return NULL;
 
-	ffa_dev = kzalloc_obj(*ffa_dev, GFP_KERNEL);
+	ffa_dev = kzalloc_obj(*ffa_dev);
 	if (!ffa_dev) {
 		ida_free(&ffa_bus_id, id);
 		return NULL;
diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c
index 8962212ad218..12a625387d6e 100644
--- a/drivers/firmware/arm_ffa/driver.c
+++ b/drivers/firmware/arm_ffa/driver.c
@@ -410,7 +410,7 @@ ffa_partition_probe(const uuid_t *uuid, struct ffa_partition_info **buffer)
 	if (count <= 0)
 		return count;
 
-	pbuf = kzalloc_objs(*pbuf, count, GFP_KERNEL);
+	pbuf = kzalloc_objs(*pbuf, count);
 	if (!pbuf)
 		return -ENOMEM;
 
@@ -1376,7 +1376,7 @@ static int __ffa_notify_request(struct ffa_device *dev, bool is_per_vcpu,
 	if (notify_id >= FFA_MAX_NOTIFICATIONS)
 		return -EINVAL;
 
-	cb_info = kzalloc_obj(*cb_info, GFP_KERNEL);
+	cb_info = kzalloc_obj(*cb_info);
 	if (!cb_info)
 		return -ENOMEM;
 
@@ -1647,7 +1647,7 @@ static int ffa_xa_add_partition_info(struct ffa_device *dev)
 		}
 	}
 
-	info = kzalloc_obj(*info, GFP_KERNEL);
+	info = kzalloc_obj(*info);
 	if (!info)
 		return ret;
 
@@ -1655,7 +1655,7 @@ static int ffa_xa_add_partition_info(struct ffa_device *dev)
 	info->dev = dev;
 
 	if (!phead) {
-		phead = kzalloc_obj(*phead, GFP_KERNEL);
+		phead = kzalloc_obj(*phead);
 		if (!phead)
 			goto free_out;
 
@@ -2039,7 +2039,7 @@ static int __init ffa_init(void)
 	if (ret)
 		return ret;
 
-	drv_info = kzalloc_obj(*drv_info, GFP_KERNEL);
+	drv_info = kzalloc_obj(*drv_info);
 	if (!drv_info)
 		return -ENOMEM;
 
diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c
index 49a168c5ff85..793be9eabaed 100644
--- a/drivers/firmware/arm_scmi/bus.c
+++ b/drivers/firmware/arm_scmi/bus.c
@@ -90,7 +90,7 @@ static int scmi_protocol_device_request(const struct scmi_device_id *id_table)
 	 * No duplicate found for requested id_table, so let's create a new
 	 * requested device entry for this new valid request.
 	 */
-	rdev = kzalloc_obj(*rdev, GFP_KERNEL);
+	rdev = kzalloc_obj(*rdev);
 	if (!rdev) {
 		ret = -ENOMEM;
 		goto out;
@@ -103,7 +103,7 @@ static int scmi_protocol_device_request(const struct scmi_device_id *id_table)
 	 * there.
 	 */
 	if (!phead) {
-		phead = kzalloc_obj(*phead, GFP_KERNEL);
+		phead = kzalloc_obj(*phead);
 		if (!phead) {
 			kfree(rdev);
 			ret = -ENOMEM;
@@ -445,7 +445,7 @@ __scmi_device_create(struct device_node *np, struct device *parent,
 		return NULL;
 	}
 
-	scmi_dev = kzalloc_obj(*scmi_dev, GFP_KERNEL);
+	scmi_dev = kzalloc_obj(*scmi_dev);
 	if (!scmi_dev)
 		return NULL;
 
diff --git a/drivers/firmware/arm_scmi/notify.c b/drivers/firmware/arm_scmi/notify.c
index d2a6390cbc5c..9168794adae4 100644
--- a/drivers/firmware/arm_scmi/notify.c
+++ b/drivers/firmware/arm_scmi/notify.c
@@ -897,7 +897,7 @@ scmi_allocate_event_handler(struct scmi_notify_instance *ni, u32 evt_key)
 {
 	struct scmi_event_handler *hndl;
 
-	hndl = kzalloc_obj(*hndl, GFP_KERNEL);
+	hndl = kzalloc_obj(*hndl);
 	if (!hndl)
 		return NULL;
 	hndl->key = evt_key;
diff --git a/drivers/firmware/arm_scmi/raw_mode.c b/drivers/firmware/arm_scmi/raw_mode.c
index 99a4a70cf117..1f6e51670208 100644
--- a/drivers/firmware/arm_scmi/raw_mode.c
+++ b/drivers/firmware/arm_scmi/raw_mode.c
@@ -908,7 +908,7 @@ static int scmi_dbg_raw_mode_open(struct inode *inode, struct file *filp)
 		return -ENODEV;
 
 	raw = inode->i_private;
-	rd = kzalloc_obj(*rd, GFP_KERNEL);
+	rd = kzalloc_obj(*rd);
 	if (!rd)
 		return -ENOMEM;
 
diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c
index 70a1697a1e6b..00e74449ce09 100644
--- a/drivers/firmware/arm_scpi.c
+++ b/drivers/firmware/arm_scpi.c
@@ -633,14 +633,14 @@ static struct scpi_dvfs_info *scpi_dvfs_get_info(u8 domain)
 	if (!buf.opp_count)
 		return ERR_PTR(-ENOENT);
 
-	info = kmalloc_obj(*info, GFP_KERNEL);
+	info = kmalloc_obj(*info);
 	if (!info)
 		return ERR_PTR(-ENOMEM);
 
 	info->count = buf.opp_count;
 	info->latency = le16_to_cpu(buf.latency) * 1000; /* uS to nS */
 
-	info->opps = kzalloc_objs(*opp, info->count, GFP_KERNEL);
+	info->opps = kzalloc_objs(*opp, info->count);
 	if (!info->opps) {
 		kfree(info);
 		return ERR_PTR(-ENOMEM);
diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
index c8d737e754e6..f39ed7ba3a38 100644
--- a/drivers/firmware/arm_sdei.c
+++ b/drivers/firmware/arm_sdei.c
@@ -205,7 +205,7 @@ static struct sdei_event *sdei_event_create(u32 event_num,
 
 	lockdep_assert_held(&sdei_events_lock);
 
-	event = kzalloc_obj(*event, GFP_KERNEL);
+	event = kzalloc_obj(*event);
 	if (!event) {
 		err = -ENOMEM;
 		goto fail;
@@ -227,7 +227,7 @@ static struct sdei_event *sdei_event_create(u32 event_num,
 	event->type = result;
 
 	if (event->type == SDEI_EVENT_TYPE_SHARED) {
-		reg = kzalloc_obj(*reg, GFP_KERNEL);
+		reg = kzalloc_obj(*reg);
 		if (!reg) {
 			err = -ENOMEM;
 			goto fail;
diff --git a/drivers/firmware/cirrus/cs_dsp.c b/drivers/firmware/cirrus/cs_dsp.c
index 148d31eea977..b4f1c01e3b5b 100644
--- a/drivers/firmware/cirrus/cs_dsp.c
+++ b/drivers/firmware/cirrus/cs_dsp.c
@@ -1059,7 +1059,7 @@ static int cs_dsp_create_control(struct cs_dsp *dsp,
 		}
 	}
 
-	ctl = kzalloc_obj(*ctl, GFP_KERNEL);
+	ctl = kzalloc_obj(*ctl);
 	if (!ctl)
 		return -ENOMEM;
 
@@ -1781,7 +1781,7 @@ static struct cs_dsp_alg_region *cs_dsp_create_region(struct cs_dsp *dsp,
 {
 	struct cs_dsp_alg_region_list_item *item;
 
-	item = kzalloc_obj(*item, GFP_KERNEL);
+	item = kzalloc_obj(*item);
 	if (!item)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
index dddddfbc479d..477a37e2ef80 100644
--- a/drivers/firmware/dmi-id.c
+++ b/drivers/firmware/dmi-id.c
@@ -237,7 +237,7 @@ static int __init dmi_id_init(void)
 	if (ret)
 		return ret;
 
-	dmi_dev = kzalloc_obj(*dmi_dev, GFP_KERNEL);
+	dmi_dev = kzalloc_obj(*dmi_dev);
 	if (!dmi_dev) {
 		ret = -ENOMEM;
 		goto fail_class_unregister;
diff --git a/drivers/firmware/dmi-sysfs.c b/drivers/firmware/dmi-sysfs.c
index 4424ad075aff..cda53d037715 100644
--- a/drivers/firmware/dmi-sysfs.c
+++ b/drivers/firmware/dmi-sysfs.c
@@ -451,7 +451,7 @@ static int dmi_system_event_log(struct dmi_sysfs_entry *entry)
 {
 	int ret;
 
-	entry->child = kzalloc_obj(*entry->child, GFP_KERNEL);
+	entry->child = kzalloc_obj(*entry->child);
 	if (!entry->child)
 		return -ENOMEM;
 	ret = kobject_init_and_add(entry->child,
@@ -586,7 +586,7 @@ static void __init dmi_sysfs_register_handle(const struct dmi_header *dh,
 		return;
 
 	/* Allocate and register a new entry into the entries set */
-	entry = kzalloc_obj(*entry, GFP_KERNEL);
+	entry = kzalloc_obj(*entry);
 	if (!entry) {
 		*ret = -ENOMEM;
 		return;
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index 631fbd3ea60c..f980c5b56858 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -740,7 +740,7 @@ edd_init(void)
 		return -ENOMEM;
 
 	for (i = 0; i < edd_num_devices(); i++) {
-		edev = kzalloc_obj(*edev, GFP_KERNEL);
+		edev = kzalloc_obj(*edev);
 		if (!edev) {
 			rc = -ENOMEM;
 			goto out;
diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
index 35b69e629d6d..3167cab62014 100644
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c
@@ -113,7 +113,7 @@ static int __init arm_enable_runtime_services(void)
 			if (!(md->attribute & EFI_MEMORY_SP))
 				continue;
 
-			res = kzalloc_obj(*res, GFP_KERNEL);
+			res = kzalloc_obj(*res);
 			if (WARN_ON(!res))
 				break;
 
diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c
index 609637f88acc..2c628a127091 100644
--- a/drivers/firmware/efi/capsule-loader.c
+++ b/drivers/firmware/efi/capsule-loader.c
@@ -282,7 +282,7 @@ static int efi_capsule_open(struct inode *inode, struct file *file)
 {
 	struct capsule_info *cap_info;
 
-	cap_info = kzalloc_obj(*cap_info, GFP_KERNEL);
+	cap_info = kzalloc_obj(*cap_info);
 	if (!cap_info)
 		return -ENOMEM;
 
@@ -292,7 +292,7 @@ static int efi_capsule_open(struct inode *inode, struct file *file)
 		return -ENOMEM;
 	}
 
-	cap_info->phys = kzalloc_obj(phys_addr_t, GFP_KERNEL);
+	cap_info->phys = kzalloc_obj(phys_addr_t);
 	if (!cap_info->phys) {
 		kfree(cap_info->pages);
 		kfree(cap_info);
diff --git a/drivers/firmware/efi/capsule.c b/drivers/firmware/efi/capsule.c
index dbbff6ade4e3..dd62526380d2 100644
--- a/drivers/firmware/efi/capsule.c
+++ b/drivers/firmware/efi/capsule.c
@@ -230,7 +230,7 @@ int efi_capsule_update(efi_capsule_header_t *capsule, phys_addr_t *pages)
 	count = DIV_ROUND_UP(imagesize, PAGE_SIZE);
 	sg_count = sg_pages_num(count);
 
-	sg_pages = kzalloc_objs(*sg_pages, sg_count, GFP_KERNEL);
+	sg_pages = kzalloc_objs(*sg_pages, sg_count);
 	if (!sg_pages)
 		return -ENOMEM;
 
diff --git a/drivers/firmware/efi/efibc.c b/drivers/firmware/efi/efibc.c
index 99268c14e01e..345a10aa7086 100644
--- a/drivers/firmware/efi/efibc.c
+++ b/drivers/firmware/efi/efibc.c
@@ -47,7 +47,7 @@ static int efibc_reboot_notifier_call(struct notifier_block *notifier,
 	if (ret || !data)
 		return NOTIFY_DONE;
 
-	wdata = kmalloc_objs(efi_char16_t, MAX_DATA_LEN, GFP_KERNEL);
+	wdata = kmalloc_objs(efi_char16_t, MAX_DATA_LEN);
 	if (!wdata)
 		return NOTIFY_DONE;
 
diff --git a/drivers/firmware/efi/embedded-firmware.c b/drivers/firmware/efi/embedded-firmware.c
index e750ef2b57e8..82744b6a5582 100644
--- a/drivers/firmware/efi/embedded-firmware.c
+++ b/drivers/firmware/efi/embedded-firmware.c
@@ -64,7 +64,7 @@ static int __init efi_check_md_for_embedded_firmware(
 
 	pr_info("Found EFI embedded fw '%s'\n", desc->name);
 
-	fw = kmalloc_obj(*fw, GFP_KERNEL);
+	fw = kmalloc_obj(*fw);
 	if (!fw) {
 		memunmap(map);
 		return -ENOMEM;
diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c
index 74f38a2df8d7..df148f7331f4 100644
--- a/drivers/firmware/efi/esrt.c
+++ b/drivers/firmware/efi/esrt.c
@@ -164,7 +164,7 @@ static int esre_create_sysfs_entry(void *esre, int entry_num)
 {
 	struct esre_entry *entry;
 
-	entry = kzalloc_obj(*entry, GFP_KERNEL);
+	entry = kzalloc_obj(*entry);
 	if (!entry)
 		return -ENOMEM;
 
diff --git a/drivers/firmware/efi/mokvar-table.c b/drivers/firmware/efi/mokvar-table.c
index 78afd0fa2919..4ff0c2926097 100644
--- a/drivers/firmware/efi/mokvar-table.c
+++ b/drivers/firmware/efi/mokvar-table.c
@@ -329,7 +329,7 @@ static int __init efi_mokvar_sysfs_init(void)
 	}
 
 	while (efi_mokvar_entry_next(&mokvar_entry)) {
-		mokvar_sysfs = kzalloc_obj(*mokvar_sysfs, GFP_KERNEL);
+		mokvar_sysfs = kzalloc_obj(*mokvar_sysfs);
 		if (!mokvar_sysfs) {
 			err = -ENOMEM;
 			break;
diff --git a/drivers/firmware/efi/riscv-runtime.c b/drivers/firmware/efi/riscv-runtime.c
index ee799399da62..60cdf7bf141f 100644
--- a/drivers/firmware/efi/riscv-runtime.c
+++ b/drivers/firmware/efi/riscv-runtime.c
@@ -83,7 +83,7 @@ static int __init riscv_enable_runtime_services(void)
 			if (!(md->attribute & EFI_MEMORY_SP))
 				continue;
 
-			res = kzalloc_obj(*res, GFP_KERNEL);
+			res = kzalloc_obj(*res);
 			if (WARN_ON(!res))
 				break;
 
diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
index a142ce5c7288..e21e7408cc6d 100644
--- a/drivers/firmware/google/gsmi.c
+++ b/drivers/firmware/google/gsmi.c
@@ -153,7 +153,7 @@ static struct gsmi_buf *gsmi_buf_alloc(void)
 {
 	struct gsmi_buf *smibuf;
 
-	smibuf = kzalloc_obj(*smibuf, GFP_KERNEL);
+	smibuf = kzalloc_obj(*smibuf);
 	if (!smibuf) {
 		printk(KERN_ERR "gsmi: out of memory\n");
 		return NULL;
diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c
index 721dfa756c45..54349e579b0d 100644
--- a/drivers/firmware/google/vpd.c
+++ b/drivers/firmware/google/vpd.c
@@ -107,7 +107,7 @@ static int vpd_section_attrib_add(const u8 *key, u32 key_len,
 	if (vpd_section_check_key_name(key, key_len) != VPD_OK)
 		return VPD_OK;
 
-	info = kzalloc_obj(*info, GFP_KERNEL);
+	info = kzalloc_obj(*info);
 	if (!info)
 		return -ENOMEM;
 
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 1af5a9ef4474..e457b6049e83 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -634,7 +634,7 @@ static int __init ibft_create_kobject(struct acpi_table_ibft *header,
 	struct pci_dev *pci_dev;
 	int rc = 0;
 
-	ibft_kobj = kzalloc_obj(*ibft_kobj, GFP_KERNEL);
+	ibft_kobj = kzalloc_obj(*ibft_kobj);
 	if (!ibft_kobj)
 		return -ENOMEM;
 
@@ -773,7 +773,7 @@ static int __init ibft_register_kobjects(struct acpi_table_ibft *header)
 	if (rc)
 		return rc;
 
-	ibft_kobj = kzalloc_obj(*ibft_kobj, GFP_KERNEL);
+	ibft_kobj = kzalloc_obj(*ibft_kobj);
 	if (!ibft_kobj)
 		return -ENOMEM;
 
diff --git a/drivers/firmware/microchip/mpfs-auto-update.c b/drivers/firmware/microchip/mpfs-auto-update.c
index 5fa85af40c33..46b19d803446 100644
--- a/drivers/firmware/microchip/mpfs-auto-update.c
+++ b/drivers/firmware/microchip/mpfs-auto-update.c
@@ -162,9 +162,9 @@ static int mpfs_auto_update_verify_image(struct fw_upload *fw_uploader)
 	u32 *response_msg __free(kfree) =
 		kzalloc(AUTO_UPDATE_FEATURE_RESP_SIZE * sizeof(*response_msg), GFP_KERNEL);
 	struct mpfs_mss_response *response __free(kfree) =
-		kzalloc_obj(struct mpfs_mss_response, GFP_KERNEL);
+		kzalloc_obj(struct mpfs_mss_response);
 	struct mpfs_mss_msg *message __free(kfree) =
-		kzalloc_obj(struct mpfs_mss_msg, GFP_KERNEL);
+		kzalloc_obj(struct mpfs_mss_msg);
 	int ret;
 
 	if (!response_msg || !response || !message)
@@ -364,9 +364,9 @@ static int mpfs_auto_update_available(struct mpfs_auto_update_priv *priv)
 	u32 *response_msg __free(kfree) =
 		kzalloc(AUTO_UPDATE_FEATURE_RESP_SIZE * sizeof(*response_msg), GFP_KERNEL);
 	struct mpfs_mss_response *response __free(kfree) =
-		kzalloc_obj(struct mpfs_mss_response, GFP_KERNEL);
+		kzalloc_obj(struct mpfs_mss_response);
 	struct mpfs_mss_msg *message __free(kfree) =
-		kzalloc_obj(struct mpfs_mss_msg, GFP_KERNEL);
+		kzalloc_obj(struct mpfs_mss_msg);
 	int ret;
 
 	if (!response_msg || !response || !message)
diff --git a/drivers/firmware/psci/psci_checker.c b/drivers/firmware/psci/psci_checker.c
index 2aaf3519cdfb..e67ba9891082 100644
--- a/drivers/firmware/psci/psci_checker.c
+++ b/drivers/firmware/psci/psci_checker.c
@@ -155,7 +155,7 @@ static int alloc_init_cpu_groups(cpumask_var_t **pcpu_groups)
 	if (!alloc_cpumask_var(&tmp, GFP_KERNEL))
 		return -ENOMEM;
 
-	cpu_groups = kzalloc_objs(*cpu_groups, nb_available_cpus, GFP_KERNEL);
+	cpu_groups = kzalloc_objs(*cpu_groups, nb_available_cpus);
 	if (!cpu_groups) {
 		free_cpumask_var(tmp);
 		return -ENOMEM;
@@ -369,7 +369,7 @@ static int suspend_tests(void)
 	struct task_struct **threads;
 	int nb_threads = 0;
 
-	threads = kmalloc_objs(*threads, nb_available_cpus, GFP_KERNEL);
+	threads = kmalloc_objs(*threads, nb_available_cpus);
 	if (!threads)
 		return -ENOMEM;
 
diff --git a/drivers/firmware/qcom/qcom_qseecom.c b/drivers/firmware/qcom/qcom_qseecom.c
index 7eed43fc8174..320ec2a77524 100644
--- a/drivers/firmware/qcom/qcom_qseecom.c
+++ b/drivers/firmware/qcom/qcom_qseecom.c
@@ -50,7 +50,7 @@ static int qseecom_client_register(struct platform_device *qseecom_dev,
 	dev_info(&qseecom_dev->dev, "setting up client for %s\n", desc->app_name);
 
 	/* Allocate and set-up the client device */
-	client = kzalloc_obj(*client, GFP_KERNEL);
+	client = kzalloc_obj(*client);
 	if (!client)
 		return -ENOMEM;
 
diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c
index 50224b95d22b..87a5421bc7d5 100644
--- a/drivers/firmware/qemu_fw_cfg.c
+++ b/drivers/firmware/qemu_fw_cfg.c
@@ -94,7 +94,7 @@ static ssize_t fw_cfg_dma_transfer(void *address, u32 length, u32 control)
 	struct fw_cfg_dma_access *d = NULL;
 	ssize_t ret = length;
 
-	d = kmalloc_obj(*d, GFP_KERNEL);
+	d = kmalloc_obj(*d);
 	if (!d) {
 		ret = -ENOMEM;
 		goto end;
@@ -325,7 +325,7 @@ static ssize_t fw_cfg_write_vmcoreinfo(const struct fw_cfg_file *f)
 	static struct fw_cfg_vmcoreinfo *data;
 	ssize_t ret;
 
-	data = kmalloc_obj(struct fw_cfg_vmcoreinfo, GFP_KERNEL);
+	data = kmalloc_obj(struct fw_cfg_vmcoreinfo);
 	if (!data)
 		return -ENOMEM;
 
@@ -530,7 +530,7 @@ static int fw_cfg_build_symlink(struct kset *dir,
 			dir = to_kset(ko);
 		} else {
 			/* create new subdirectory kset */
-			subdir = kzalloc_obj(struct kset, GFP_KERNEL);
+			subdir = kzalloc_obj(struct kset);
 			if (!subdir) {
 				ret = -ENOMEM;
 				break;
@@ -593,7 +593,7 @@ static int fw_cfg_register_file(const struct fw_cfg_file *f)
 #endif
 
 	/* allocate new entry */
-	entry = kzalloc_obj(*entry, GFP_KERNEL);
+	entry = kzalloc_obj(*entry);
 	if (!entry)
 		return -ENOMEM;
 
diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
index 3b45bb74d312..0aa322e9a2e7 100644
--- a/drivers/firmware/raspberrypi.c
+++ b/drivers/firmware/raspberrypi.c
@@ -282,7 +282,7 @@ static int rpi_firmware_probe(struct platform_device *pdev)
 	 * Memory will be freed by rpi_firmware_delete() once all users have
 	 * released their firmware handles. Don't use devm_kzalloc() here.
 	 */
-	fw = kzalloc_obj(*fw, GFP_KERNEL);
+	fw = kzalloc_obj(*fw);
 	if (!fw)
 		return -ENOMEM;
 
diff --git a/drivers/firmware/smccc/soc_id.c b/drivers/firmware/smccc/soc_id.c
index 95f9163058bb..2f7475e66b3c 100644
--- a/drivers/firmware/smccc/soc_id.c
+++ b/drivers/firmware/smccc/soc_id.c
@@ -137,7 +137,7 @@ static int __init smccc_soc_init(void)
 		return -EINVAL;
 	}
 
-	soc_dev_attr = kzalloc_obj(*soc_dev_attr, GFP_KERNEL);
+	soc_dev_attr = kzalloc_obj(*soc_dev_attr);
 	if (!soc_dev_attr)
 		return -ENOMEM;
 
diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
index aefb28933990..6f5c298582ab 100644
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -535,11 +535,11 @@ static int svc_normal_to_secure_thread(void *data)
 	unsigned long a0, a1, a2, a3, a4, a5, a6, a7;
 	int ret_fifo = 0;
 
-	pdata = kmalloc_obj(*pdata, GFP_KERNEL);
+	pdata = kmalloc_obj(*pdata);
 	if (!pdata)
 		return -ENOMEM;
 
-	cbdata = kmalloc_obj(*cbdata, GFP_KERNEL);
+	cbdata = kmalloc_obj(*cbdata);
 	if (!cbdata) {
 		kfree(pdata);
 		return -ENOMEM;
@@ -1119,7 +1119,7 @@ int stratix10_svc_add_async_client(struct stratix10_svc_chan *chan,
 		return 0;
 	}
 
-	achan = kzalloc_obj(*achan, GFP_KERNEL);
+	achan = kzalloc_obj(*achan);
 	if (!achan)
 		return -ENOMEM;
 
@@ -1692,7 +1692,7 @@ int stratix10_svc_send(struct stratix10_svc_chan *chan, void *msg)
 	int ret = 0;
 	unsigned int cpu = 0;
 
-	p_data = kzalloc_obj(*p_data, GFP_KERNEL);
+	p_data = kzalloc_obj(*p_data);
 	if (!p_data)
 		return -ENOMEM;
 
diff --git a/drivers/firmware/thead,th1520-aon.c b/drivers/firmware/thead,th1520-aon.c
index 7dc871060c38..a35fd5e2a07f 100644
--- a/drivers/firmware/thead,th1520-aon.c
+++ b/drivers/firmware/thead,th1520-aon.c
@@ -205,7 +205,7 @@ struct th1520_aon_chan *th1520_aon_init(struct device *dev)
 	struct mbox_client *cl;
 	int ret;
 
-	aon_chan = kzalloc_obj(*aon_chan, GFP_KERNEL);
+	aon_chan = kzalloc_obj(*aon_chan);
 	if (!aon_chan)
 		return ERR_PTR(-ENOMEM);