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, 7 insertions, 14 deletions

diff --git a/drivers/thermal/intel/intel_hfi.c b/drivers/thermal/intel/intel_hfi.c
index 35df0fd5562f..1a1a95b39405 100644
--- a/drivers/thermal/intel/intel_hfi.c
+++ b/drivers/thermal/intel/intel_hfi.c
@@ -690,8 +690,7 @@ void __init intel_hfi_init(void)
 	 * This allocation may fail. CPU hotplug callbacks must check
 	 * for a null pointer.
 	 */
-	hfi_instances = kzalloc_objs(*hfi_instances, max_hfi_instances,
-				     GFP_KERNEL);
+	hfi_instances = kzalloc_objs(*hfi_instances, max_hfi_instances);
 	if (!hfi_instances)
 		return;
 
diff --git a/drivers/thermal/testing/zone.c b/drivers/thermal/testing/zone.c
index 014e6e5f0e83..7af160ceb634 100644
--- a/drivers/thermal/testing/zone.c
+++ b/drivers/thermal/testing/zone.c
@@ -186,13 +186,11 @@ int tt_add_tz(void)
 {
 	int ret;
 
-	struct tt_thermal_zone *tt_zone __free(kfree) = kzalloc_obj(*tt_zone,
-								    GFP_KERNEL);
+	struct tt_thermal_zone *tt_zone __free(kfree) = kzalloc_obj(*tt_zone);
 	if (!tt_zone)
 		return -ENOMEM;
 
-	struct tt_work *tt_work __free(kfree) = kzalloc_obj(*tt_work,
-							    GFP_KERNEL);
+	struct tt_work *tt_work __free(kfree) = kzalloc_obj(*tt_work);
 	if (!tt_work)
 		return -ENOMEM;
 
@@ -245,8 +243,7 @@ int tt_del_tz(const char *arg)
 	if (ret != 1)
 		return -EINVAL;
 
-	struct tt_work *tt_work __free(kfree) = kzalloc_obj(*tt_work,
-							    GFP_KERNEL);
+	struct tt_work *tt_work __free(kfree) = kzalloc_obj(*tt_work);
 	if (!tt_work)
 		return -ENOMEM;
 
@@ -332,13 +329,11 @@ int tt_zone_add_trip(const char *arg)
 {
 	int id;
 
-	struct tt_work *tt_work __free(kfree) = kzalloc_obj(*tt_work,
-							    GFP_KERNEL);
+	struct tt_work *tt_work __free(kfree) = kzalloc_obj(*tt_work);
 	if (!tt_work)
 		return -ENOMEM;
 
-	struct tt_trip *tt_trip __free(kfree) = kzalloc_obj(*tt_trip,
-							    GFP_KERNEL);
+	struct tt_trip *tt_trip __free(kfree) = kzalloc_obj(*tt_trip);
 	if (!tt_trip)
 		return -ENOMEM;
 
diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
index 085a414d874b..6ebb83cb70b2 100644
--- a/drivers/thermal/thermal_of.c
+++ b/drivers/thermal/thermal_of.c
@@ -107,8 +107,7 @@ static struct thermal_trip *thermal_of_trips_init(struct device_node *np, int *n
 	if (!count)
 		return NULL;
 
-	struct thermal_trip *tt __free(kfree) = kzalloc_objs(*tt, count,
-							     GFP_KERNEL);
+	struct thermal_trip *tt __free(kfree) = kzalloc_objs(*tt, count);
 	if (!tt)
 		return ERR_PTR(-ENOMEM);