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>

6 files changed, 11 insertions, 11 deletions

diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index 2e3b95ae2718..0f15c5de8df8 100644
--- a/drivers/parport/daisy.c
+++ b/drivers/parport/daisy.c
@@ -51,7 +51,7 @@ static int assign_addrs(struct parport *port);
 static void add_dev(int devnum, struct parport *port, int daisy)
 {
 	struct daisydev *newdev, **p;
-	newdev = kmalloc_obj(struct daisydev, GFP_KERNEL);
+	newdev = kmalloc_obj(struct daisydev);
 	if (newdev) {
 		newdev->port = port;
 		newdev->daisy = daisy;
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index f8318db9a75f..2c1c8253a00b 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -87,7 +87,7 @@ static int parport_probe(struct pcmcia_device *link)
     dev_dbg(&link->dev, "parport_attach()\n");
 
     /* Create new parport device */
-    info = kzalloc_obj(*info, GFP_KERNEL);
+    info = kzalloc_obj(*info);
     if (!info) return -ENOMEM;
     link->priv = info;
     info->p_dev = link;
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
index f442c1fb0d7a..e5e8054a1af8 100644
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
@@ -234,7 +234,7 @@ static struct parport *parport_gsc_probe_port(unsigned long base,
 	struct parport tmp;
 	struct parport *p = &tmp;
 
-	priv = kzalloc_obj(struct parport_gsc_private, GFP_KERNEL);
+	priv = kzalloc_obj(struct parport_gsc_private);
 	if (!priv) {
 		printk(KERN_DEBUG "parport (0x%lx): no memory!\n", base);
 		return NULL;
diff --git a/drivers/parport/parport_ip32.c b/drivers/parport/parport_ip32.c
index 84c4bba2756e..14a4f4251d5c 100644
--- a/drivers/parport/parport_ip32.c
+++ b/drivers/parport/parport_ip32.c
@@ -2031,8 +2031,8 @@ static __init struct parport *parport_ip32_probe_port(void)
 	parport_ip32_make_isa_registers(&regs, &mace->isa.parallel,
 					&mace->isa.ecp1284, 8 /* regshift */);
 
-	ops = kmalloc_obj(struct parport_operations, GFP_KERNEL);
-	priv = kmalloc_obj(struct parport_ip32_private, GFP_KERNEL);
+	ops = kmalloc_obj(struct parport_operations);
+	priv = kmalloc_obj(struct parport_ip32_private);
 	p = parport_register_port(0, PARPORT_IRQ_NONE, PARPORT_DMA_NONE, ops);
 	if (ops == NULL || priv == NULL || p == NULL) {
 		err = -ENOMEM;
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 99d44864b9ff..c75abdd8ef25 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -2056,11 +2056,11 @@ static struct parport *__parport_pc_probe_port(unsigned long int base,
 		}
 	}
 
-	ops = kmalloc_obj(struct parport_operations, GFP_KERNEL);
+	ops = kmalloc_obj(struct parport_operations);
 	if (!ops)
 		goto out1;
 
-	priv = kmalloc_obj(struct parport_pc_private, GFP_KERNEL);
+	priv = kmalloc_obj(struct parport_pc_private);
 	if (!priv)
 		goto out2;
 
@@ -2880,7 +2880,7 @@ static int parport_pc_pci_probe(struct pci_dev *dev,
 	if (err)
 		return err;
 
-	data = kmalloc_obj(struct pci_parport_data, GFP_KERNEL);
+	data = kmalloc_obj(struct pci_parport_data);
 	if (!data)
 		return -ENOMEM;
 
diff --git a/drivers/parport/share.c b/drivers/parport/share.c
index 44e5d37afbf8..ba5292828703 100644
--- a/drivers/parport/share.c
+++ b/drivers/parport/share.c
@@ -430,7 +430,7 @@ struct parport *parport_register_port(unsigned long base, int irq, int dma,
 	int device;
 	int ret;
 
-	tmp = kzalloc_obj(struct parport, GFP_KERNEL);
+	tmp = kzalloc_obj(struct parport);
 	if (!tmp)
 		return NULL;
 
@@ -709,11 +709,11 @@ parport_register_dev_model(struct parport *port, const char *name,
 
 	parport_get_port(port);
 
-	par_dev = kzalloc_obj(*par_dev, GFP_KERNEL);
+	par_dev = kzalloc_obj(*par_dev);
 	if (!par_dev)
 		goto err_put_port;
 
-	par_dev->state = kzalloc_obj(*par_dev->state, GFP_KERNEL);
+	par_dev->state = kzalloc_obj(*par_dev->state);
 	if (!par_dev->state)
 		goto err_put_par_dev;