Convert more 'alloc_obj' cases to default GFP_KERNEL argumentsHEADmaster

This converts some of the visually simpler cases that have been split
over multiple lines.  I only did the ones that are easy to verify the
resulting diff by having just that final GFP_KERNEL argument on the next
line.

Somebody should probably do a proper coccinelle script for this, but for
me the trivial script actually resulted in an assertion failure in the
middle of the script.  I probably had made it a bit _too_ trivial.

So after fighting that far a while I decided to just do some of the
syntactically simpler cases with variations of the previous 'sed'
scripts.

The more syntactically complex multi-line cases would mostly really want
whitespace cleanup anyway.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 3 insertions, 6 deletions

diff --git a/drivers/net/wireless/ath/wil6210/fw_inc.c b/drivers/net/wireless/ath/wil6210/fw_inc.c
index bc172f5a70c9..e998627141a0 100644
--- a/drivers/net/wireless/ath/wil6210/fw_inc.c
+++ b/drivers/net/wireless/ath/wil6210/fw_inc.c
@@ -160,8 +160,7 @@ fw_handle_brd_file(struct wil6210_priv *wil, const void *data,
 		return -EINVAL;
 	}
 
-	wil->brd_info = kzalloc_objs(struct wil_brd_info, max_num_ent,
-				     GFP_KERNEL);
+	wil->brd_info = kzalloc_objs(struct wil_brd_info, max_num_ent);
 	if (!wil->brd_info)
 		return -ENOMEM;
 
diff --git a/drivers/net/wireless/ath/wil6210/pmc.c b/drivers/net/wireless/ath/wil6210/pmc.c
index 8d368c901122..cdc38ebf8d41 100644
--- a/drivers/net/wireless/ath/wil6210/pmc.c
+++ b/drivers/net/wireless/ath/wil6210/pmc.c
@@ -85,8 +85,7 @@ void wil_pmc_alloc(struct wil6210_priv *wil,
 		     num_descriptors, descriptor_size);
 
 	/* allocate descriptors info list in pmc context*/
-	pmc->descriptors = kzalloc_objs(struct desc_alloc_info, num_descriptors,
-					GFP_KERNEL);
+	pmc->descriptors = kzalloc_objs(struct desc_alloc_info, num_descriptors);
 	if (!pmc->descriptors) {
 		wil_err(wil, "ERROR allocating pmc skb list\n");
 		goto no_release_err;
diff --git a/drivers/net/wireless/ath/wil6210/txrx_edma.c b/drivers/net/wireless/ath/wil6210/txrx_edma.c
index c4c6b3088a7a..1c54f50d0cc5 100644
--- a/drivers/net/wireless/ath/wil6210/txrx_edma.c
+++ b/drivers/net/wireless/ath/wil6210/txrx_edma.c
@@ -314,8 +314,7 @@ static int wil_init_rx_buff_arr(struct wil6210_priv *wil,
 	struct list_head *free = &wil->rx_buff_mgmt.free;
 	int i;
 
-	wil->rx_buff_mgmt.buff_arr = kzalloc_objs(struct wil_rx_buff, size + 1,
-						  GFP_KERNEL);
+	wil->rx_buff_mgmt.buff_arr = kzalloc_objs(struct wil_rx_buff, size + 1);
 	if (!wil->rx_buff_mgmt.buff_arr)
 		return -ENOMEM;