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>

22 files changed, 32 insertions, 32 deletions

diff --git a/arch/sparc/kernel/central.c b/arch/sparc/kernel/central.c
index 904c4223230f..16b45d172fb0 100644
--- a/arch/sparc/kernel/central.c
+++ b/arch/sparc/kernel/central.c
@@ -63,7 +63,7 @@ static int clock_board_calc_nslots(struct clock_board *p)
 
 static int clock_board_probe(struct platform_device *op)
 {
-	struct clock_board *p = kzalloc_obj(*p, GFP_KERNEL);
+	struct clock_board *p = kzalloc_obj(*p);
 	int err = -ENOMEM;
 
 	if (!p) {
@@ -159,7 +159,7 @@ static struct platform_driver clock_board_driver = {
 
 static int fhc_probe(struct platform_device *op)
 {
-	struct fhc *p = kzalloc_obj(*p, GFP_KERNEL);
+	struct fhc *p = kzalloc_obj(*p);
 	int err = -ENOMEM;
 	u32 reg;
 
diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c
index 663b2d7ff7bc..d935177b6953 100644
--- a/arch/sparc/kernel/chmc.c
+++ b/arch/sparc/kernel/chmc.c
@@ -417,7 +417,7 @@ static int jbusmc_probe(struct platform_device *op)
 	num_mem_regs = len / sizeof(*mem_regs);
 
 	err = -ENOMEM;
-	p = kzalloc_obj(*p, GFP_KERNEL);
+	p = kzalloc_obj(*p);
 	if (!p) {
 		printk(KERN_ERR PFX "Cannot allocate struct jbusmc.\n");
 		goto out;
@@ -718,7 +718,7 @@ static int chmc_probe(struct platform_device *op)
 	}
 
 	err = -ENOMEM;
-	p = kzalloc_obj(*p, GFP_KERNEL);
+	p = kzalloc_obj(*p);
 	if (!p) {
 		printk(KERN_ERR PFX "Could not allocate struct chmc.\n");
 		goto out;
diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
index df3fa6d96074..b34db8125bba 100644
--- a/arch/sparc/kernel/ds.c
+++ b/arch/sparc/kernel/ds.c
@@ -1175,7 +1175,7 @@ static int ds_probe(struct vio_dev *vdev, const struct vio_device_id *id)
 	if (ds_version_printed++ == 0)
 		printk(KERN_INFO "%s", version);
 
-	dp = kzalloc_obj(*dp, GFP_KERNEL);
+	dp = kzalloc_obj(*dp);
 	err = -ENOMEM;
 	if (!dp)
 		goto out_err;
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 82d248e6b822..cbc0680a4642 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -238,7 +238,7 @@ unsigned long sparc_dma_alloc_resource(struct device *dev, size_t len)
 {
 	struct resource *res;
 
-	res = kzalloc_obj(*res, GFP_KERNEL);
+	res = kzalloc_obj(*res);
 	if (!res)
 		return 0;
 	res->name = dev->of_node->full_name;
diff --git a/arch/sparc/kernel/ldc.c b/arch/sparc/kernel/ldc.c
index 4fd357d5fc29..826fe8ed0289 100644
--- a/arch/sparc/kernel/ldc.c
+++ b/arch/sparc/kernel/ldc.c
@@ -1171,7 +1171,7 @@ struct ldc_channel *ldc_alloc(unsigned long id,
 
 	mssbuf = NULL;
 
-	lp = kzalloc_obj(*lp, GFP_KERNEL);
+	lp = kzalloc_obj(*lp);
 	err = -ENOMEM;
 	if (!lp)
 		goto out_err;
diff --git a/arch/sparc/kernel/leon_pci_grpci2.c b/arch/sparc/kernel/leon_pci_grpci2.c
index c6d5cec12b67..c1cbdf88146c 100644
--- a/arch/sparc/kernel/leon_pci_grpci2.c
+++ b/arch/sparc/kernel/leon_pci_grpci2.c
@@ -721,7 +721,7 @@ static int grpci2_of_probe(struct platform_device *ofdev)
 		goto err1;
 	}
 
-	priv = grpci2priv = kzalloc_obj(struct grpci2_priv, GFP_KERNEL);
+	priv = grpci2priv = kzalloc_obj(struct grpci2_priv);
 	if (grpci2priv == NULL) {
 		err = -ENOMEM;
 		goto err1;
diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
index 51e90a093ee0..b62b1d0291a4 100644
--- a/arch/sparc/kernel/of_device_32.c
+++ b/arch/sparc/kernel/of_device_32.c
@@ -340,7 +340,7 @@ static void __init build_device_resources(struct platform_device *op,
 static struct platform_device * __init scan_one_device(struct device_node *dp,
 						 struct device *parent)
 {
-	struct platform_device *op = kzalloc_obj(*op, GFP_KERNEL);
+	struct platform_device *op = kzalloc_obj(*op);
 	const struct linux_prom_irqs *intr;
 	struct dev_archdata *sd;
 	int len, i;
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index c30ad34525bd..0b87eb629a62 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -633,7 +633,7 @@ out:
 static struct platform_device * __init scan_one_device(struct device_node *dp,
 						 struct device *parent)
 {
-	struct platform_device *op = kzalloc_obj(*op, GFP_KERNEL);
+	struct platform_device *op = kzalloc_obj(*op);
 	const unsigned int *irq;
 	struct dev_archdata *sd;
 	int len, i;
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 432f83cf61aa..7e41574634b3 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -650,7 +650,7 @@ static void pci_claim_legacy_resources(struct pci_dev *dev)
 	if ((dev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
 		return;
 
-	p = kzalloc_obj(*p, GFP_KERNEL);
+	p = kzalloc_obj(*p);
 	if (!p)
 		return;
 
diff --git a/arch/sparc/kernel/pci_common.c b/arch/sparc/kernel/pci_common.c
index 588cfc595b84..0eafcb2d88ce 100644
--- a/arch/sparc/kernel/pci_common.c
+++ b/arch/sparc/kernel/pci_common.c
@@ -336,7 +336,7 @@ static void pci_register_iommu_region(struct pci_pbm_info *pbm)
 					  NULL);
 
 	if (vdma) {
-		struct resource *rp = kzalloc_obj(*rp, GFP_KERNEL);
+		struct resource *rp = kzalloc_obj(*rp);
 
 		if (!rp) {
 			pr_info("%s: Cannot allocate IOMMU resource.\n",
diff --git a/arch/sparc/kernel/pci_fire.c b/arch/sparc/kernel/pci_fire.c
index b72cf5acbdba..c35a8e3c1eae 100644
--- a/arch/sparc/kernel/pci_fire.c
+++ b/arch/sparc/kernel/pci_fire.c
@@ -468,13 +468,13 @@ static int fire_probe(struct platform_device *op)
 	portid = of_getintprop_default(dp, "portid", 0xff);
 
 	err = -ENOMEM;
-	pbm = kzalloc_obj(*pbm, GFP_KERNEL);
+	pbm = kzalloc_obj(*pbm);
 	if (!pbm) {
 		printk(KERN_ERR PFX "Cannot allocate pci_pbminfo.\n");
 		goto out_err;
 	}
 
-	iommu = kzalloc_obj(struct iommu, GFP_KERNEL);
+	iommu = kzalloc_obj(struct iommu);
 	if (!iommu) {
 		printk(KERN_ERR PFX "Cannot allocate PBM iommu.\n");
 		goto out_free_controller;
diff --git a/arch/sparc/kernel/pci_psycho.c b/arch/sparc/kernel/pci_psycho.c
index 9880b341a631..199ab73f84af 100644
--- a/arch/sparc/kernel/pci_psycho.c
+++ b/arch/sparc/kernel/pci_psycho.c
@@ -519,7 +519,7 @@ static int psycho_probe(struct platform_device *op)
 	upa_portid = of_getintprop_default(dp, "upa-portid", 0xff);
 
 	err = -ENOMEM;
-	pbm = kzalloc_obj(*pbm, GFP_KERNEL);
+	pbm = kzalloc_obj(*pbm);
 	if (!pbm) {
 		printk(KERN_ERR PFX "Cannot allocate pci_pbm_info.\n");
 		goto out_err;
@@ -529,7 +529,7 @@ static int psycho_probe(struct platform_device *op)
 	if (pbm->sibling) {
 		iommu = pbm->sibling->iommu;
 	} else {
-		iommu = kzalloc_obj(struct iommu, GFP_KERNEL);
+		iommu = kzalloc_obj(struct iommu);
 		if (!iommu) {
 			printk(KERN_ERR PFX "Cannot allocate PBM iommu.\n");
 			goto out_free_controller;
diff --git a/arch/sparc/kernel/pci_sabre.c b/arch/sparc/kernel/pci_sabre.c
index 3b4116f23862..1109d5b344eb 100644
--- a/arch/sparc/kernel/pci_sabre.c
+++ b/arch/sparc/kernel/pci_sabre.c
@@ -482,13 +482,13 @@ static int sabre_probe(struct platform_device *op)
 	}
 
 	err = -ENOMEM;
-	pbm = kzalloc_obj(*pbm, GFP_KERNEL);
+	pbm = kzalloc_obj(*pbm);
 	if (!pbm) {
 		printk(KERN_ERR PFX "Cannot allocate pci_pbm_info.\n");
 		goto out_err;
 	}
 
-	iommu = kzalloc_obj(*iommu, GFP_KERNEL);
+	iommu = kzalloc_obj(*iommu);
 	if (!iommu) {
 		printk(KERN_ERR PFX "Cannot allocate PBM iommu.\n");
 		goto out_free_controller;
diff --git a/arch/sparc/kernel/pci_schizo.c b/arch/sparc/kernel/pci_schizo.c
index 519a80a639d6..4348ca2c4a3f 100644
--- a/arch/sparc/kernel/pci_schizo.c
+++ b/arch/sparc/kernel/pci_schizo.c
@@ -1426,7 +1426,7 @@ static int __schizo_init(struct platform_device *op, unsigned long chip_type)
 	portid = of_getintprop_default(dp, "portid", 0xff);
 
 	err = -ENOMEM;
-	pbm = kzalloc_obj(*pbm, GFP_KERNEL);
+	pbm = kzalloc_obj(*pbm);
 	if (!pbm) {
 		printk(KERN_ERR PFX "Cannot allocate pci_pbm_info.\n");
 		goto out_err;
@@ -1434,7 +1434,7 @@ static int __schizo_init(struct platform_device *op, unsigned long chip_type)
 
 	pbm->sibling = schizo_find_sibling(portid, chip_type);
 
-	iommu = kzalloc_obj(struct iommu, GFP_KERNEL);
+	iommu = kzalloc_obj(struct iommu);
 	if (!iommu) {
 		printk(KERN_ERR PFX "Cannot allocate PBM A iommu.\n");
 		goto out_free_pbm;
diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
index 4e842fb48602..440284cc804e 100644
--- a/arch/sparc/kernel/pci_sun4v.c
+++ b/arch/sparc/kernel/pci_sun4v.c
@@ -754,7 +754,7 @@ static int pci_sun4v_atu_alloc_iotsb(struct pci_pbm_info *pbm)
 	unsigned long order;
 	unsigned long err;
 
-	iotsb = kzalloc_obj(*iotsb, GFP_KERNEL);
+	iotsb = kzalloc_obj(*iotsb);
 	if (!iotsb) {
 		err = -ENOMEM;
 		goto out_err;
@@ -1292,13 +1292,13 @@ static int pci_sun4v_probe(struct platform_device *op)
 		iommu_batch_initialized = 1;
 	}
 
-	pbm = kzalloc_obj(*pbm, GFP_KERNEL);
+	pbm = kzalloc_obj(*pbm);
 	if (!pbm) {
 		printk(KERN_ERR PFX "Could not allocate pci_pbm_info\n");
 		goto out_err;
 	}
 
-	iommu = kzalloc_obj(struct iommu, GFP_KERNEL);
+	iommu = kzalloc_obj(struct iommu);
 	if (!iommu) {
 		printk(KERN_ERR PFX "Could not allocate pbm iommu\n");
 		goto out_free_controller;
@@ -1307,7 +1307,7 @@ static int pci_sun4v_probe(struct platform_device *op)
 	pbm->iommu = iommu;
 	iommu->atu = NULL;
 	if (hv_atu) {
-		atu = kzalloc_obj(*atu, GFP_KERNEL);
+		atu = kzalloc_obj(*atu);
 		if (!atu)
 			pr_err(PFX "Could not allocate atu\n");
 		else
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c
index 46a7b53737d4..1b0db16cd37b 100644
--- a/arch/sparc/kernel/setup_32.c
+++ b/arch/sparc/kernel/setup_32.c
@@ -388,7 +388,7 @@ static int __init topology_init(void)
 
 	err = 0;
 	for_each_online_cpu(i) {
-		struct cpu *p = kzalloc_obj(*p, GFP_KERNEL);
+		struct cpu *p = kzalloc_obj(*p);
 		if (!p)
 			err = -ENOMEM;
 		else
diff --git a/arch/sparc/kernel/starfire.c b/arch/sparc/kernel/starfire.c
index 7736dc34f6ad..d8ee9a69ae31 100644
--- a/arch/sparc/kernel/starfire.c
+++ b/arch/sparc/kernel/starfire.c
@@ -50,7 +50,7 @@ void starfire_hookup(int upaid)
 	struct starfire_irqinfo *p;
 	unsigned long treg_base, hwmid, i;
 
-	p = kmalloc_obj(*p, GFP_KERNEL);
+	p = kmalloc_obj(*p);
 	if (!p) {
 		prom_printf("starfire_hookup: No memory, this is insane.\n");
 		prom_halt();
diff --git a/arch/sparc/kernel/vio.c b/arch/sparc/kernel/vio.c
index 0d21a8e567da..8b4f55047716 100644
--- a/arch/sparc/kernel/vio.c
+++ b/arch/sparc/kernel/vio.c
@@ -325,7 +325,7 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp,
 		return NULL;
 	}
 
-	vdev = kzalloc_obj(*vdev, GFP_KERNEL);
+	vdev = kzalloc_obj(*vdev);
 	if (!vdev) {
 		printk(KERN_ERR "VIO: Could not allocate vio_dev\n");
 		return NULL;
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 2c4986e95713..f46394c46a76 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -3070,7 +3070,7 @@ static int __init report_memory(void)
 	kernel_lds_init();
 
 	for (i = 0; i < pavail_ents; i++) {
-		res = kzalloc_obj(struct resource, GFP_KERNEL);
+		res = kzalloc_obj(struct resource);
 
 		if (!res) {
 			pr_warn("Failed to allocate source.\n");
diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c
index 3ca7cc2b9bfb..df0eb99a4175 100644
--- a/arch/sparc/mm/iommu.c
+++ b/arch/sparc/mm/iommu.c
@@ -64,7 +64,7 @@ static void __init sbus_iommu_init(struct platform_device *op)
 	unsigned long base;
 	unsigned long tmp;
 
-	iommu = kmalloc_obj(struct iommu_struct, GFP_KERNEL);
+	iommu = kmalloc_obj(struct iommu_struct);
 	if (!iommu) {
 		prom_printf("Unable to allocate iommu structure\n");
 		prom_halt();
diff --git a/arch/sparc/net/bpf_jit_comp_64.c b/arch/sparc/net/bpf_jit_comp_64.c
index 884b201259d6..b23d1c645ae5 100644
--- a/arch/sparc/net/bpf_jit_comp_64.c
+++ b/arch/sparc/net/bpf_jit_comp_64.c
@@ -1505,7 +1505,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
 
 	jit_data = prog->aux->jit_data;
 	if (!jit_data) {
-		jit_data = kzalloc_obj(*jit_data, GFP_KERNEL);
+		jit_data = kzalloc_obj(*jit_data);
 		if (!jit_data) {
 			prog = orig_prog;
 			goto out;
diff --git a/arch/sparc/vdso/vma.c b/arch/sparc/vdso/vma.c
index bba84959c69d..c454689ce5fa 100644
--- a/arch/sparc/vdso/vma.c
+++ b/arch/sparc/vdso/vma.c
@@ -266,7 +266,7 @@ static int __init init_vdso_image(const struct vdso_image *image,
 	if (WARN_ON(image->size % PAGE_SIZE != 0))
 		goto oom;
 
-	cpp = kzalloc_objs(struct page *, cnpages, GFP_KERNEL);
+	cpp = kzalloc_objs(struct page *, cnpages);
 	vdso_mapping->pages = cpp;
 
 	if (!cpp)
@@ -288,7 +288,7 @@ static int __init init_vdso_image(const struct vdso_image *image,
 		dnpages = (sizeof(struct vvar_data) / PAGE_SIZE) + 1;
 		if (WARN_ON(dnpages != 1))
 			goto oom;
-		dpp = kzalloc_objs(struct page *, dnpages, GFP_KERNEL);
+		dpp = kzalloc_objs(struct page *, dnpages);
 		vvar_mapping.pages = dpp;
 
 		if (!dpp)