Convert more 'alloc_obj' cases to default GFP_KERNEL arguments

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/firmware/efi/apple-properties.c b/drivers/firmware/efi/apple-properties.c
index c458852cea76..13ac28754c03 100644
--- a/drivers/firmware/efi/apple-properties.c
+++ b/drivers/firmware/efi/apple-properties.c
@@ -146,8 +146,7 @@ static int __init unmarshal_devices(struct properties_header *properties)
 			goto skip_device;
 		}
 
-		entry = kzalloc_objs(*entry, dev_header->prop_count + 1,
-				     GFP_KERNEL);
+		entry = kzalloc_objs(*entry, dev_header->prop_count + 1);
 		if (!entry) {
 			dev_err(dev, "cannot allocate properties\n");
 			goto skip_device;
diff --git a/drivers/firmware/efi/test/efi_test.c b/drivers/firmware/efi/test/efi_test.c
index 0e3b00a572b2..d54d6a671326 100644
--- a/drivers/firmware/efi/test/efi_test.c
+++ b/drivers/firmware/efi/test/efi_test.c
@@ -614,8 +614,7 @@ static long efi_runtime_query_capsulecaps(unsigned long arg)
 	if (qcaps.capsule_count == ULONG_MAX)
 		return -EINVAL;
 
-	capsules = kzalloc_objs(efi_capsule_header_t, qcaps.capsule_count + 1,
-				GFP_KERNEL);
+	capsules = kzalloc_objs(efi_capsule_header_t, qcaps.capsule_count + 1);
 	if (!capsules)
 		return -ENOMEM;
 
diff --git a/drivers/firmware/qcom/qcom_tzmem.c b/drivers/firmware/qcom/qcom_tzmem.c
index 74ea67a49cab..0635cbeacfc8 100644
--- a/drivers/firmware/qcom/qcom_tzmem.c
+++ b/drivers/firmware/qcom/qcom_tzmem.c
@@ -262,8 +262,7 @@ qcom_tzmem_pool_new(const struct qcom_tzmem_pool_config *config)
 		return ERR_PTR(-EINVAL);
 	}
 
-	struct qcom_tzmem_pool *pool __free(kfree) = kzalloc_obj(*pool,
-								 GFP_KERNEL);
+	struct qcom_tzmem_pool *pool __free(kfree) = kzalloc_obj(*pool);
 	if (!pool)
 		return ERR_PTR(-ENOMEM);