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>

5 files changed, 8 insertions, 8 deletions

diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c
index 9f9cb764d8be..d3083a547aa5 100644
--- a/drivers/sbus/char/bbc_envctrl.c
+++ b/drivers/sbus/char/bbc_envctrl.c
@@ -448,7 +448,7 @@ static void attach_one_temp(struct bbc_i2c_bus *bp, struct platform_device *op,
 {
 	struct bbc_cpu_temperature *tp;
 
-	tp = kzalloc_obj(*tp, GFP_KERNEL);
+	tp = kzalloc_obj(*tp);
 	if (!tp)
 		return;
 
@@ -496,7 +496,7 @@ static void attach_one_fan(struct bbc_i2c_bus *bp, struct platform_device *op,
 {
 	struct bbc_fan_control *fp;
 
-	fp = kzalloc_obj(*fp, GFP_KERNEL);
+	fp = kzalloc_obj(*fp);
 	if (!fp)
 		return;
 
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c
index 3a4b36514485..1801ba56389c 100644
--- a/drivers/sbus/char/bbc_i2c.c
+++ b/drivers/sbus/char/bbc_i2c.c
@@ -92,7 +92,7 @@ struct bbc_i2c_client *bbc_i2c_attach(struct bbc_i2c_bus *bp, struct platform_de
 	struct bbc_i2c_client *client;
 	const u32 *reg;
 
-	client = kzalloc_obj(*client, GFP_KERNEL);
+	client = kzalloc_obj(*client);
 	if (!client)
 		return NULL;
 	client->bp = bp;
@@ -298,7 +298,7 @@ static struct bbc_i2c_bus * attach_one_i2c(struct platform_device *op, int index
 	struct device_node *dp;
 	int entry;
 
-	bp = kzalloc_obj(*bp, GFP_KERNEL);
+	bp = kzalloc_obj(*bp);
 	if (!bp)
 		return NULL;
 
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index 77de0d987d44..0b90a2450429 100644
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
@@ -666,7 +666,7 @@ static int openprom_open(struct inode * inode, struct file * file)
 {
 	DATA *data;
 
-	data = kmalloc_obj(DATA, GFP_KERNEL);
+	data = kmalloc_obj(DATA);
 	if (!data)
 		return -ENOMEM;
 
diff --git a/drivers/sbus/char/oradax.c b/drivers/sbus/char/oradax.c
index ff31511a6c85..45df0b274491 100644
--- a/drivers/sbus/char/oradax.c
+++ b/drivers/sbus/char/oradax.c
@@ -643,11 +643,11 @@ static int dax_open(struct inode *inode, struct file *f)
 	struct dax_ctx *ctx = NULL;
 	int i;
 
-	ctx = kzalloc_obj(*ctx, GFP_KERNEL);
+	ctx = kzalloc_obj(*ctx);
 	if (ctx == NULL)
 		goto done;
 
-	ctx->ccb_buf = kzalloc_objs(struct dax_ccb, DAX_MAX_CCBS, GFP_KERNEL);
+	ctx->ccb_buf = kzalloc_objs(struct dax_ccb, DAX_MAX_CCBS);
 	if (ctx->ccb_buf == NULL)
 		goto done;
 
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c
index e9a28ab02ddb..85aaec5876a7 100644
--- a/drivers/sbus/char/uctrl.c
+++ b/drivers/sbus/char/uctrl.c
@@ -348,7 +348,7 @@ static int uctrl_probe(struct platform_device *op)
 	struct uctrl_driver *p;
 	int err = -ENOMEM;
 
-	p = kzalloc_obj(*p, GFP_KERNEL);
+	p = kzalloc_obj(*p);
 	if (!p) {
 		printk(KERN_ERR "uctrl: Unable to allocate device struct.\n");
 		goto out;