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>

3 files changed, 18 insertions, 18 deletions

diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c
index dc7c29240cac..f5deed37567b 100644
--- a/drivers/net/ethernet/microsoft/mana/gdma_main.c
+++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c
@@ -923,7 +923,7 @@ int mana_gd_create_hwc_queue(struct gdma_dev *gd,
 	struct gdma_queue *queue;
 	int err;
 
-	queue = kzalloc_obj(*queue, GFP_KERNEL);
+	queue = kzalloc_obj(*queue);
 	if (!queue)
 		return -ENOMEM;
 
@@ -1062,7 +1062,7 @@ int mana_gd_create_mana_eq(struct gdma_dev *gd,
 	if (spec->type != GDMA_EQ)
 		return -EINVAL;
 
-	queue = kzalloc_obj(*queue, GFP_KERNEL);
+	queue = kzalloc_obj(*queue);
 	if (!queue)
 		return -ENOMEM;
 
@@ -1115,7 +1115,7 @@ int mana_gd_create_mana_wq_cq(struct gdma_dev *gd,
 	    spec->type != GDMA_RQ)
 		return -EINVAL;
 
-	queue = kzalloc_obj(*queue, GFP_KERNEL);
+	queue = kzalloc_obj(*queue);
 	if (!queue)
 		return -ENOMEM;
 
@@ -1625,7 +1625,7 @@ static int mana_gd_setup_dyn_irqs(struct pci_dev *pdev, int nvec)
 	bool skip_first_cpu = false;
 	int *irqs, irq, err, i;
 
-	irqs = kmalloc_objs(int, nvec, GFP_KERNEL);
+	irqs = kmalloc_objs(int, nvec);
 	if (!irqs)
 		return -ENOMEM;
 
@@ -1636,7 +1636,7 @@ static int mana_gd_setup_dyn_irqs(struct pci_dev *pdev, int nvec)
 	 * further used in irq_setup()
 	 */
 	for (i = 1; i <= nvec; i++) {
-		gic = kzalloc_obj(*gic, GFP_KERNEL);
+		gic = kzalloc_obj(*gic);
 		if (!gic) {
 			err = -ENOMEM;
 			goto free_irq;
@@ -1707,14 +1707,14 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev, int nvec)
 	unsigned int cpu;
 	int err, i;
 
-	irqs = kmalloc_objs(int, nvec, GFP_KERNEL);
+	irqs = kmalloc_objs(int, nvec);
 	if (!irqs)
 		return -ENOMEM;
 
 	start_irqs = irqs;
 
 	for (i = 0; i < nvec; i++) {
-		gic = kzalloc_obj(*gic, GFP_KERNEL);
+		gic = kzalloc_obj(*gic);
 		if (!gic) {
 			err = -ENOMEM;
 			goto free_irq;
@@ -2071,7 +2071,7 @@ disable_dev:
 
 		dev_info(&pdev->dev, "Start MANA recovery mode\n");
 
-		dev = kzalloc_obj(*dev, GFP_KERNEL);
+		dev = kzalloc_obj(*dev);
 		if (!dev)
 			return err;
 
diff --git a/drivers/net/ethernet/microsoft/mana/hw_channel.c b/drivers/net/ethernet/microsoft/mana/hw_channel.c
index f2221e65a6a3..9ee0f7f110dd 100644
--- a/drivers/net/ethernet/microsoft/mana/hw_channel.c
+++ b/drivers/net/ethernet/microsoft/mana/hw_channel.c
@@ -407,7 +407,7 @@ static int mana_hwc_create_cq(struct hw_channel_context *hwc, u16 q_depth,
 	if (cq_size < MANA_MIN_QSIZE)
 		cq_size = MANA_MIN_QSIZE;
 
-	hwc_cq = kzalloc_obj(*hwc_cq, GFP_KERNEL);
+	hwc_cq = kzalloc_obj(*hwc_cq);
 	if (!hwc_cq)
 		return -ENOMEM;
 
@@ -426,7 +426,7 @@ static int mana_hwc_create_cq(struct hw_channel_context *hwc, u16 q_depth,
 	}
 	hwc_cq->gdma_cq = cq;
 
-	comp_buf = kzalloc_objs(*comp_buf, q_depth, GFP_KERNEL);
+	comp_buf = kzalloc_objs(*comp_buf, q_depth);
 	if (!comp_buf) {
 		err = -ENOMEM;
 		goto out;
@@ -539,7 +539,7 @@ static int mana_hwc_create_wq(struct hw_channel_context *hwc,
 	if (queue_size < MANA_MIN_QSIZE)
 		queue_size = MANA_MIN_QSIZE;
 
-	hwc_wq = kzalloc_obj(*hwc_wq, GFP_KERNEL);
+	hwc_wq = kzalloc_obj(*hwc_wq);
 	if (!hwc_wq)
 		return -ENOMEM;
 
@@ -644,7 +644,7 @@ static int mana_hwc_test_channel(struct hw_channel_context *hwc, u16 q_depth,
 			return err;
 	}
 
-	ctx = kzalloc_objs(*ctx, q_depth, GFP_KERNEL);
+	ctx = kzalloc_objs(*ctx, q_depth);
 	if (!ctx)
 		return -ENOMEM;
 
@@ -750,7 +750,7 @@ int mana_hwc_create_channel(struct gdma_context *gc)
 	u16 q_depth_max;
 	int err;
 
-	hwc = kzalloc_obj(*hwc, GFP_KERNEL);
+	hwc = kzalloc_obj(*hwc);
 	if (!hwc)
 		return -ENOMEM;
 
diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index 5c9704f2041a..dad52eaa152f 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -803,7 +803,7 @@ int mana_pre_alloc_rxbufs(struct mana_port_context *mpc, int new_mtu, int num_qu
 	if (!mpc->rxbufs_pre)
 		goto error;
 
-	mpc->das_pre = kmalloc_objs(dma_addr_t, num_rxb, GFP_KERNEL);
+	mpc->das_pre = kmalloc_objs(dma_addr_t, num_rxb);
 	if (!mpc->das_pre)
 		goto error;
 
@@ -995,7 +995,7 @@ static void mana_cleanup_indir_table(struct mana_port_context *apc)
 
 static int mana_init_port_context(struct mana_port_context *apc)
 {
-	apc->rxqs = kzalloc_objs(struct mana_rxq *, apc->num_queues, GFP_KERNEL);
+	apc->rxqs = kzalloc_objs(struct mana_rxq *, apc->num_queues);
 
 	return !apc->rxqs ? -ENOMEM : 0;
 }
@@ -1632,7 +1632,7 @@ static int mana_create_eq(struct mana_context *ac)
 	int err;
 	int i;
 
-	ac->eqs = kzalloc_objs(struct mana_eq, gc->max_num_queues, GFP_KERNEL);
+	ac->eqs = kzalloc_objs(struct mana_eq, gc->max_num_queues);
 	if (!ac->eqs)
 		return -ENOMEM;
 
@@ -3415,7 +3415,7 @@ static int add_adev(struct gdma_dev *gd, const char *name)
 	struct mana_adev *madev;
 	int ret;
 
-	madev = kzalloc_obj(*madev, GFP_KERNEL);
+	madev = kzalloc_obj(*madev);
 	if (!madev)
 		return -ENOMEM;
 
@@ -3559,7 +3559,7 @@ int mana_probe(struct gdma_dev *gd, bool resuming)
 		return err;
 
 	if (!resuming) {
-		ac = kzalloc_obj(*ac, GFP_KERNEL);
+		ac = kzalloc_obj(*ac);
 		if (!ac)
 			return -ENOMEM;