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>

15 files changed, 33 insertions, 33 deletions

diff --git a/drivers/crypto/intel/iaa/iaa_crypto_main.c b/drivers/crypto/intel/iaa/iaa_crypto_main.c
index bcd2bfcc19af..547abf453d4a 100644
--- a/drivers/crypto/intel/iaa/iaa_crypto_main.c
+++ b/drivers/crypto/intel/iaa/iaa_crypto_main.c
@@ -335,7 +335,7 @@ int add_iaa_compression_mode(const char *name,
 		goto out;
 	}
 
-	mode = kzalloc_obj(*mode, GFP_KERNEL);
+	mode = kzalloc_obj(*mode);
 	if (!mode)
 		goto out;
 
@@ -422,7 +422,7 @@ static int init_device_compression_mode(struct iaa_device *iaa_device,
 	struct iaa_device_compression_mode *device_mode;
 	int ret = -ENOMEM;
 
-	device_mode = kzalloc_obj(*device_mode, GFP_KERNEL);
+	device_mode = kzalloc_obj(*device_mode);
 	if (!device_mode)
 		return -ENOMEM;
 
@@ -503,7 +503,7 @@ static struct iaa_device *iaa_device_alloc(void)
 {
 	struct iaa_device *iaa_device;
 
-	iaa_device = kzalloc_obj(*iaa_device, GFP_KERNEL);
+	iaa_device = kzalloc_obj(*iaa_device);
 	if (!iaa_device)
 		return NULL;
 
@@ -561,7 +561,7 @@ static int add_iaa_wq(struct iaa_device *iaa_device, struct idxd_wq *wq,
 	struct device *dev = &pdev->dev;
 	struct iaa_wq *iaa_wq;
 
-	iaa_wq = kzalloc_obj(*iaa_wq, GFP_KERNEL);
+	iaa_wq = kzalloc_obj(*iaa_wq);
 	if (!iaa_wq)
 		return -ENOMEM;
 
@@ -718,7 +718,7 @@ static int alloc_wq_table(int max_wqs)
 
 	for (cpu = 0; cpu < nr_cpus; cpu++) {
 		entry = per_cpu_ptr(wq_table, cpu);
-		entry->wqs = kzalloc_objs(*entry->wqs, max_wqs, GFP_KERNEL);
+		entry->wqs = kzalloc_objs(*entry->wqs, max_wqs);
 		if (!entry->wqs) {
 			free_wq_table();
 			return -ENOMEM;
diff --git a/drivers/crypto/intel/keembay/ocs-hcu.c b/drivers/crypto/intel/keembay/ocs-hcu.c
index 2c9e523361df..87711068d747 100644
--- a/drivers/crypto/intel/keembay/ocs-hcu.c
+++ b/drivers/crypto/intel/keembay/ocs-hcu.c
@@ -491,7 +491,7 @@ struct ocs_hcu_dma_list *ocs_hcu_dma_list_alloc(struct ocs_hcu_dev *hcu_dev,
 {
 	struct ocs_hcu_dma_list *dma_list;
 
-	dma_list = kmalloc_obj(*dma_list, GFP_KERNEL);
+	dma_list = kmalloc_obj(*dma_list);
 	if (!dma_list)
 		return NULL;
 
diff --git a/drivers/crypto/intel/qat/qat_common/adf_accel_engine.c b/drivers/crypto/intel/qat/qat_common/adf_accel_engine.c
index 935f4f9d8a7c..f9f1018a2823 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_accel_engine.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_accel_engine.c
@@ -178,7 +178,7 @@ int adf_ae_init(struct adf_accel_dev *accel_dev)
 	if (!hw_device->fw_name)
 		return 0;
 
-	loader_data = kzalloc_obj(*loader_data, GFP_KERNEL);
+	loader_data = kzalloc_obj(*loader_data);
 	if (!loader_data)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/intel/qat/qat_common/adf_aer.c b/drivers/crypto/intel/qat/qat_common/adf_aer.c
index a65e88d28f53..ed01fb9ad74e 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_aer.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_aer.c
@@ -160,7 +160,7 @@ static int adf_dev_aer_schedule_reset(struct adf_accel_dev *accel_dev,
 		return 0;
 
 	set_bit(ADF_STATUS_RESTARTING, &accel_dev->status);
-	reset_data = kzalloc_obj(*reset_data, GFP_KERNEL);
+	reset_data = kzalloc_obj(*reset_data);
 	if (!reset_data)
 		return -ENOMEM;
 	reset_data->accel_dev = accel_dev;
diff --git a/drivers/crypto/intel/qat/qat_common/adf_cfg.c b/drivers/crypto/intel/qat/qat_common/adf_cfg.c
index c348d290fc51..c202209f17d5 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_cfg.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_cfg.c
@@ -68,7 +68,7 @@ int adf_cfg_dev_add(struct adf_accel_dev *accel_dev)
 {
 	struct adf_cfg_device_data *dev_cfg_data;
 
-	dev_cfg_data = kzalloc_obj(*dev_cfg_data, GFP_KERNEL);
+	dev_cfg_data = kzalloc_obj(*dev_cfg_data);
 	if (!dev_cfg_data)
 		return -ENOMEM;
 	INIT_LIST_HEAD(&dev_cfg_data->sec_list);
@@ -289,7 +289,7 @@ int adf_cfg_add_key_value_param(struct adf_accel_dev *accel_dev,
 	if (!section)
 		return -EFAULT;
 
-	key_val = kzalloc_obj(*key_val, GFP_KERNEL);
+	key_val = kzalloc_obj(*key_val);
 	if (!key_val)
 		return -ENOMEM;
 
@@ -356,7 +356,7 @@ int adf_cfg_section_add(struct adf_accel_dev *accel_dev, const char *name)
 	if (sec)
 		return 0;
 
-	sec = kzalloc_obj(*sec, GFP_KERNEL);
+	sec = kzalloc_obj(*sec);
 	if (!sec)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c b/drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c
index 2068fe29a24c..e050de16ab5d 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c
@@ -172,7 +172,7 @@ int adf_devmgr_add_dev(struct adf_accel_dev *accel_dev,
 			goto unlock;
 		}
 		num_devices++;
-		map = kzalloc_obj(*map, GFP_KERNEL);
+		map = kzalloc_obj(*map);
 		if (!map) {
 			ret = -ENOMEM;
 			goto unlock;
@@ -204,7 +204,7 @@ int adf_devmgr_add_dev(struct adf_accel_dev *accel_dev,
 			goto unlock;
 		}
 
-		map = kzalloc_obj(*map, GFP_KERNEL);
+		map = kzalloc_obj(*map);
 		if (!map) {
 			ret = -ENOMEM;
 			goto unlock;
diff --git a/drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.c b/drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.c
index 622da38ce385..bf2bae78a40d 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.c
@@ -59,7 +59,7 @@ static int adf_gen4_vfmig_open_device(struct qat_mig_dev *mdev)
 
 	vf_info = &accel_dev->pf.vf_info[mdev->vf_id];
 
-	vfmig = kzalloc_obj(*vfmig, GFP_KERNEL);
+	vfmig = kzalloc_obj(*vfmig);
 	if (!vfmig)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/intel/qat/qat_common/adf_heartbeat.c b/drivers/crypto/intel/qat/qat_common/adf_heartbeat.c
index 95a9efceda6d..0cdb4241f04b 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_heartbeat.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_heartbeat.c
@@ -281,7 +281,7 @@ int adf_heartbeat_init(struct adf_accel_dev *accel_dev)
 {
 	struct adf_heartbeat *hb;
 
-	hb = kzalloc_obj(*hb, GFP_KERNEL);
+	hb = kzalloc_obj(*hb);
 	if (!hb)
 		goto err_ret;
 
diff --git a/drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c b/drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c
index 1fbade552370..f9017e03ec0f 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c
@@ -37,7 +37,7 @@ struct adf_mstate_mgr *adf_mstate_mgr_new(u8 *buf, u32 size)
 {
 	struct adf_mstate_mgr *mgr;
 
-	mgr = kzalloc_obj(*mgr, GFP_KERNEL);
+	mgr = kzalloc_obj(*mgr);
 	if (!mgr)
 		return NULL;
 
diff --git a/drivers/crypto/intel/qat/qat_common/adf_rl.c b/drivers/crypto/intel/qat/qat_common/adf_rl.c
index 2e037df286cc..997ef448a4df 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_rl.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_rl.c
@@ -622,7 +622,7 @@ static int add_new_sla_entry(struct adf_accel_dev *accel_dev,
 	struct rl_sla *sla;
 	int ret = 0;
 
-	sla = kzalloc_obj(*sla, GFP_KERNEL);
+	sla = kzalloc_obj(*sla);
 	if (!sla) {
 		ret = -ENOMEM;
 		goto ret_err;
@@ -1065,7 +1065,7 @@ int adf_rl_init(struct adf_accel_dev *accel_dev)
 		goto err_ret;
 	}
 
-	rl = kzalloc_obj(*rl, GFP_KERNEL);
+	rl = kzalloc_obj(*rl);
 	if (!rl) {
 		ret = -ENOMEM;
 		goto err_ret;
diff --git a/drivers/crypto/intel/qat/qat_common/adf_timer.c b/drivers/crypto/intel/qat/qat_common/adf_timer.c
index 3f5267c98ff3..cee965f9368d 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_timer.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_timer.c
@@ -40,7 +40,7 @@ int adf_timer_start(struct adf_accel_dev *accel_dev)
 {
 	struct adf_timer *timer_ctx;
 
-	timer_ctx = kzalloc_obj(*timer_ctx, GFP_KERNEL);
+	timer_ctx = kzalloc_obj(*timer_ctx);
 	if (!timer_ctx)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/intel/qat/qat_common/adf_transport_debug.c b/drivers/crypto/intel/qat/qat_common/adf_transport_debug.c
index a27f1d76998e..a8f853516a3f 100644
--- a/drivers/crypto/intel/qat/qat_common/adf_transport_debug.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_transport_debug.c
@@ -99,7 +99,7 @@ int adf_ring_debugfs_add(struct adf_etr_ring_data *ring, const char *name)
 	struct adf_etr_ring_debug_entry *ring_debug;
 	char entry_name[16];
 
-	ring_debug = kzalloc_obj(*ring_debug, GFP_KERNEL);
+	ring_debug = kzalloc_obj(*ring_debug);
 	if (!ring_debug)
 		return -ENOMEM;
 
diff --git a/drivers/crypto/intel/qat/qat_common/qat_hal.c b/drivers/crypto/intel/qat/qat_common/qat_hal.c
index 86523a70b3a9..7a6ba6f22e3e 100644
--- a/drivers/crypto/intel/qat/qat_common/qat_hal.c
+++ b/drivers/crypto/intel/qat/qat_common/qat_hal.c
@@ -832,17 +832,17 @@ int qat_hal_init(struct adf_accel_dev *accel_dev)
 	struct icp_qat_fw_loader_handle *handle;
 	int ret = 0;
 
-	handle = kzalloc_obj(*handle, GFP_KERNEL);
+	handle = kzalloc_obj(*handle);
 	if (!handle)
 		return -ENOMEM;
 
-	handle->hal_handle = kzalloc_obj(*handle->hal_handle, GFP_KERNEL);
+	handle->hal_handle = kzalloc_obj(*handle->hal_handle);
 	if (!handle->hal_handle) {
 		ret = -ENOMEM;
 		goto out_hal_handle;
 	}
 
-	handle->chip_info = kzalloc_obj(*handle->chip_info, GFP_KERNEL);
+	handle->chip_info = kzalloc_obj(*handle->chip_info);
 	if (!handle->chip_info) {
 		ret = -ENOMEM;
 		goto out_chip_info;
diff --git a/drivers/crypto/intel/qat/qat_common/qat_mig_dev.c b/drivers/crypto/intel/qat/qat_common/qat_mig_dev.c
index 4fb4b0cac64e..3869ada0190d 100644
--- a/drivers/crypto/intel/qat/qat_common/qat_mig_dev.c
+++ b/drivers/crypto/intel/qat/qat_common/qat_mig_dev.c
@@ -24,7 +24,7 @@ struct qat_mig_dev *qat_vfmig_create(struct pci_dev *pdev, int vf_id)
 	    !ops->load_state || !ops->save_setup || !ops->load_setup)
 		return ERR_PTR(-EINVAL);
 
-	mdev = kmalloc_obj(*mdev, GFP_KERNEL);
+	mdev = kmalloc_obj(*mdev);
 	if (!mdev)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/crypto/intel/qat/qat_common/qat_uclo.c b/drivers/crypto/intel/qat/qat_common/qat_uclo.c
index be0cfd9dd09a..30f83f06d185 100644
--- a/drivers/crypto/intel/qat/qat_common/qat_uclo.c
+++ b/drivers/crypto/intel/qat/qat_common/qat_uclo.c
@@ -42,10 +42,10 @@ static int qat_uclo_init_ae_data(struct icp_qat_uclo_objhandle *obj_handle,
 	} else {
 		ae_slice->ctx_mask_assigned = 0;
 	}
-	ae_slice->region = kzalloc_obj(*ae_slice->region, GFP_KERNEL);
+	ae_slice->region = kzalloc_obj(*ae_slice->region);
 	if (!ae_slice->region)
 		return -ENOMEM;
-	ae_slice->page = kzalloc_obj(*ae_slice->page, GFP_KERNEL);
+	ae_slice->page = kzalloc_obj(*ae_slice->page);
 	if (!ae_slice->page)
 		goto out_err;
 	page = ae_slice->page;
@@ -258,7 +258,7 @@ static int qat_uclo_create_batch_init_list(struct icp_qat_fw_loader_handle
 
 	init_header = *init_tab_base;
 	if (!init_header) {
-		init_header = kzalloc_obj(*init_header, GFP_KERNEL);
+		init_header = kzalloc_obj(*init_header);
 		if (!init_header)
 			return -ENOMEM;
 		init_header->size = 1;
@@ -270,7 +270,7 @@ static int qat_uclo_create_batch_init_list(struct icp_qat_fw_loader_handle
 		tail_old = tail_old->next;
 	tail = tail_old;
 	for (i = 0; i < init_mem->val_attr_num; i++) {
-		mem_init = kzalloc_obj(*mem_init, GFP_KERNEL);
+		mem_init = kzalloc_obj(*mem_init);
 		if (!mem_init)
 			goto out_err;
 		mem_init->ae = ae;
@@ -501,7 +501,7 @@ qat_uclo_map_chunk(char *buf, struct icp_qat_uof_filehdr *file_hdr,
 			if (file_chunk->checksum != qat_uclo_calc_str_checksum(
 				chunk, file_chunk->size))
 				break;
-			obj_hdr = kzalloc_obj(*obj_hdr, GFP_KERNEL);
+			obj_hdr = kzalloc_obj(*obj_hdr);
 			if (!obj_hdr)
 				break;
 			obj_hdr->file_buff = chunk;
@@ -634,7 +634,7 @@ static int qat_uclo_map_uimage(struct icp_qat_uclo_objhandle *obj_handle,
 		if (qat_uclo_check_image_compat(encap_uof_obj, image))
 			goto out_err;
 		ae_uimage[j].page =
-			kzalloc_obj(struct icp_qat_uclo_encap_page, GFP_KERNEL);
+			kzalloc_obj(struct icp_qat_uclo_encap_page);
 		if (!ae_uimage[j].page)
 			goto out_err;
 		qat_uclo_map_image_page(encap_uof_obj, image,
@@ -1719,7 +1719,7 @@ static int qat_uclo_map_suof_obj(struct icp_qat_fw_loader_handle *handle,
 {
 	struct icp_qat_suof_handle *suof_handle;
 
-	suof_handle = kzalloc_obj(*suof_handle, GFP_KERNEL);
+	suof_handle = kzalloc_obj(*suof_handle);
 	if (!suof_handle)
 		return -ENOMEM;
 	handle->sobj_handle = suof_handle;
@@ -1763,7 +1763,7 @@ static int qat_uclo_map_uof_obj(struct icp_qat_fw_loader_handle *handle,
 	struct icp_qat_uof_filehdr *filehdr;
 	struct icp_qat_uclo_objhandle *objhdl;
 
-	objhdl = kzalloc_obj(*objhdl, GFP_KERNEL);
+	objhdl = kzalloc_obj(*objhdl);
 	if (!objhdl)
 		return -ENOMEM;
 	objhdl->obj_buf = kmemdup(addr_ptr, mem_size, GFP_KERNEL);
@@ -2003,7 +2003,7 @@ static int qat_uclo_map_mof_obj(struct icp_qat_fw_loader_handle *handle,
 	if (qat_uclo_check_mof_format(mof_ptr))
 		return -EINVAL;
 
-	mobj_handle = kzalloc_obj(*mobj_handle, GFP_KERNEL);
+	mobj_handle = kzalloc_obj(*mobj_handle);
 	if (!mobj_handle)
 		return -ENOMEM;