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>

11 files changed, 21 insertions, 21 deletions

diff --git a/drivers/virt/acrn/hsm.c b/drivers/virt/acrn/hsm.c
index c73a566d135d..74f2086fa59f 100644
--- a/drivers/virt/acrn/hsm.c
+++ b/drivers/virt/acrn/hsm.c
@@ -30,7 +30,7 @@ static int acrn_dev_open(struct inode *inode, struct file *filp)
 {
 	struct acrn_vm *vm;
 
-	vm = kzalloc_obj(*vm, GFP_KERNEL);
+	vm = kzalloc_obj(*vm);
 	if (!vm)
 		return -ENOMEM;
 
@@ -64,7 +64,7 @@ static int pmcmd_ioctl(u64 cmd, void __user *uptr)
 		kfree(pm_info);
 		break;
 	case ACRN_PMCMD_GET_PX_DATA:
-		px_data = kzalloc_obj(*px_data, GFP_KERNEL);
+		px_data = kzalloc_obj(*px_data);
 		if (!px_data)
 			return -ENOMEM;
 
@@ -79,7 +79,7 @@ static int pmcmd_ioctl(u64 cmd, void __user *uptr)
 		kfree(px_data);
 		break;
 	case ACRN_PMCMD_GET_CX_DATA:
-		cx_data = kzalloc_obj(*cx_data, GFP_KERNEL);
+		cx_data = kzalloc_obj(*cx_data);
 		if (!cx_data)
 			return -ENOMEM;
 
diff --git a/drivers/virt/acrn/ioeventfd.c b/drivers/virt/acrn/ioeventfd.c
index 5daccfaa127b..66fe9f3cef99 100644
--- a/drivers/virt/acrn/ioeventfd.c
+++ b/drivers/virt/acrn/ioeventfd.c
@@ -96,7 +96,7 @@ static int acrn_ioeventfd_assign(struct acrn_vm *vm,
 	if (IS_ERR(eventfd))
 		return PTR_ERR(eventfd);
 
-	p = kzalloc_obj(*p, GFP_KERNEL);
+	p = kzalloc_obj(*p);
 	if (!p) {
 		ret = -ENOMEM;
 		goto fail;
diff --git a/drivers/virt/acrn/ioreq.c b/drivers/virt/acrn/ioreq.c
index 2216e62406e0..584698d30607 100644
--- a/drivers/virt/acrn/ioreq.c
+++ b/drivers/virt/acrn/ioreq.c
@@ -123,7 +123,7 @@ int acrn_ioreq_range_add(struct acrn_ioreq_client *client,
 		return -EINVAL;
 	}
 
-	range = kzalloc_obj(*range, GFP_KERNEL);
+	range = kzalloc_obj(*range);
 	if (!range)
 		return -ENOMEM;
 
@@ -424,7 +424,7 @@ struct acrn_ioreq_client *acrn_ioreq_client_create(struct acrn_vm *vm,
 			"Cannot create non-default client w/o handler!\n");
 		return NULL;
 	}
-	client = kzalloc_obj(*client, GFP_KERNEL);
+	client = kzalloc_obj(*client);
 	if (!client)
 		return NULL;
 
@@ -602,7 +602,7 @@ int acrn_ioreq_init(struct acrn_vm *vm, u64 buf_vma)
 	if (vm->ioreq_buf)
 		return -EEXIST;
 
-	set_buffer = kzalloc_obj(*set_buffer, GFP_KERNEL);
+	set_buffer = kzalloc_obj(*set_buffer);
 	if (!set_buffer)
 		return -ENOMEM;
 
diff --git a/drivers/virt/acrn/irqfd.c b/drivers/virt/acrn/irqfd.c
index f0ff5140699f..acf8cd5f8f8c 100644
--- a/drivers/virt/acrn/irqfd.c
+++ b/drivers/virt/acrn/irqfd.c
@@ -112,7 +112,7 @@ static int acrn_irqfd_assign(struct acrn_vm *vm, struct acrn_irqfd *args)
 	__poll_t events;
 	int ret = 0;
 
-	irqfd = kzalloc_obj(*irqfd, GFP_KERNEL);
+	irqfd = kzalloc_obj(*irqfd);
 	if (!irqfd)
 		return -ENOMEM;
 
diff --git a/drivers/virt/acrn/mm.c b/drivers/virt/acrn/mm.c
index 86b386761ee3..757cd84eff3b 100644
--- a/drivers/virt/acrn/mm.c
+++ b/drivers/virt/acrn/mm.c
@@ -21,7 +21,7 @@ static int modify_region(struct acrn_vm *vm, struct vm_memory_region_op *region)
 	struct vm_memory_region_batch *regions;
 	int ret;
 
-	regions = kzalloc_obj(*regions, GFP_KERNEL);
+	regions = kzalloc_obj(*regions);
 	if (!regions)
 		return -ENOMEM;
 
@@ -55,7 +55,7 @@ int acrn_mm_region_add(struct acrn_vm *vm, u64 user_gpa, u64 service_gpa,
 	struct vm_memory_region_op *region;
 	int ret = 0;
 
-	region = kzalloc_obj(*region, GFP_KERNEL);
+	region = kzalloc_obj(*region);
 	if (!region)
 		return -ENOMEM;
 
@@ -87,7 +87,7 @@ int acrn_mm_region_del(struct acrn_vm *vm, u64 user_gpa, u64 size)
 	struct vm_memory_region_op *region;
 	int ret = 0;
 
-	region = kzalloc_obj(*region, GFP_KERNEL);
+	region = kzalloc_obj(*region);
 	if (!region)
 		return -ENOMEM;
 
diff --git a/drivers/virt/coco/guest/report.c b/drivers/virt/coco/guest/report.c
index ab50adfec7ec..b254a1416286 100644
--- a/drivers/virt/coco/guest/report.c
+++ b/drivers/virt/coco/guest/report.c
@@ -428,7 +428,7 @@ static struct config_item *tsm_report_make_item(struct config_group *group,
 	if (!provider.ops)
 		return ERR_PTR(-ENXIO);
 
-	state = kzalloc_obj(*state, GFP_KERNEL);
+	state = kzalloc_obj(*state);
 	if (!state)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/virt/coco/tsm-core.c b/drivers/virt/coco/tsm-core.c
index b783fd36fc7e..98dcf7d836df 100644
--- a/drivers/virt/coco/tsm-core.c
+++ b/drivers/virt/coco/tsm-core.c
@@ -35,7 +35,7 @@ static struct tsm_dev *alloc_tsm_dev(struct device *parent)
 	int id;
 
 	struct tsm_dev *tsm_dev __free(kfree) =
-		kzalloc_obj(*tsm_dev, GFP_KERNEL);
+		kzalloc_obj(*tsm_dev);
 	if (!tsm_dev)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/virt/fsl_hypervisor.c b/drivers/virt/fsl_hypervisor.c
index 541ee3a4909c..f472c94806da 100644
--- a/drivers/virt/fsl_hypervisor.c
+++ b/drivers/virt/fsl_hypervisor.c
@@ -226,7 +226,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
 	 * 'pages' is an array of struct page pointers that's initialized by
 	 * get_user_pages_fast().
 	 */
-	pages = kzalloc_objs(struct page *, num_pages, GFP_KERNEL);
+	pages = kzalloc_objs(struct page *, num_pages);
 	if (!pages) {
 		pr_debug("fsl-hv: could not allocate page list\n");
 		return -ENOMEM;
@@ -660,7 +660,7 @@ static int fsl_hv_open(struct inode *inode, struct file *filp)
 	struct doorbell_queue *dbq;
 	unsigned long flags;
 
-	dbq = kzalloc_obj(struct doorbell_queue, GFP_KERNEL);
+	dbq = kzalloc_obj(struct doorbell_queue);
 	if (!dbq) {
 		pr_err("fsl-hv: out of memory\n");
 		return -ENOMEM;
@@ -845,7 +845,7 @@ static int __init fsl_hypervisor_init(void)
 			continue;
 		}
 
-		dbisr = kzalloc_obj(*dbisr, GFP_KERNEL);
+		dbisr = kzalloc_obj(*dbisr);
 		if (!dbisr)
 			goto out_of_memory;
 
diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev.c b/drivers/virt/nitro_enclaves/ne_misc_dev.c
index 1ad44e92348a..e96d32f4eef8 100644
--- a/drivers/virt/nitro_enclaves/ne_misc_dev.c
+++ b/drivers/virt/nitro_enclaves/ne_misc_dev.c
@@ -928,7 +928,7 @@ static int ne_set_user_memory_region_ioctl(struct ne_enclave *ne_enclave,
 	if (rc < 0)
 		return rc;
 
-	ne_mem_region = kzalloc_obj(*ne_mem_region, GFP_KERNEL);
+	ne_mem_region = kzalloc_obj(*ne_mem_region);
 	if (!ne_mem_region)
 		return -ENOMEM;
 
@@ -1616,7 +1616,7 @@ static int ne_create_vm_ioctl(struct ne_pci_dev *ne_pci_dev, u64 __user *slot_ui
 
 	mutex_unlock(&ne_cpu_pool.mutex);
 
-	ne_enclave = kzalloc_obj(*ne_enclave, GFP_KERNEL);
+	ne_enclave = kzalloc_obj(*ne_enclave);
 	if (!ne_enclave)
 		return -ENOMEM;
 
diff --git a/drivers/virt/nitro_enclaves/ne_pci_dev.c b/drivers/virt/nitro_enclaves/ne_pci_dev.c
index a219657ace80..3e1455d50526 100644
--- a/drivers/virt/nitro_enclaves/ne_pci_dev.c
+++ b/drivers/virt/nitro_enclaves/ne_pci_dev.c
@@ -468,7 +468,7 @@ static int ne_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	struct ne_pci_dev *ne_pci_dev = NULL;
 	int rc = -EINVAL;
 
-	ne_pci_dev = kzalloc_obj(*ne_pci_dev, GFP_KERNEL);
+	ne_pci_dev = kzalloc_obj(*ne_pci_dev);
 	if (!ne_pci_dev)
 		return -ENOMEM;
 
diff --git a/drivers/virt/vboxguest/vboxguest_core.c b/drivers/virt/vboxguest/vboxguest_core.c
index 9621606fc5db..b5dc0d01facd 100644
--- a/drivers/virt/vboxguest/vboxguest_core.c
+++ b/drivers/virt/vboxguest/vboxguest_core.c
@@ -74,7 +74,7 @@ static void vbg_guest_mappings_init(struct vbg_dev *gdev)
 	/* Add 4M so that we can align the vmap to 4MiB as the host requires. */
 	size = PAGE_ALIGN(req->hypervisor_size) + SZ_4M;
 
-	pages = kmalloc_objs(*pages, size >> PAGE_SHIFT, GFP_KERNEL);
+	pages = kmalloc_objs(*pages, size >> PAGE_SHIFT);
 	if (!pages)
 		goto out;
 
@@ -1080,7 +1080,7 @@ struct vbg_session *vbg_core_open_session(struct vbg_dev *gdev, u32 requestor)
 {
 	struct vbg_session *session;
 
-	session = kzalloc_obj(*session, GFP_KERNEL);
+	session = kzalloc_obj(*session);
 	if (!session)
 		return ERR_PTR(-ENOMEM);