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>

11 files changed, 19 insertions, 19 deletions

diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index 9823e0bd7a51..0fa115cbf3ad 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -131,7 +131,7 @@ static struct ubi_ainf_volume *find_or_add_av(struct ubi_attach_info *ai,
 		return NULL;
 
 	/* The volume is absent - add it */
-	av = kzalloc_obj(*av, GFP_KERNEL);
+	av = kzalloc_obj(*av);
 	if (!av)
 		return ERR_PTR(-ENOMEM);
 
@@ -1451,7 +1451,7 @@ static struct ubi_attach_info *alloc_ai(const char *slab_name)
 {
 	struct ubi_attach_info *ai;
 
-	ai = kzalloc_obj(struct ubi_attach_info, GFP_KERNEL);
+	ai = kzalloc_obj(struct ubi_attach_info);
 	if (!ai)
 		return ai;
 
diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
index 4428486fb287..8880a783c3bc 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -368,7 +368,7 @@ int ubiblock_create(struct ubi_volume_info *vi)
 		goto out_unlock;
 	}
 
-	dev = kzalloc_obj(struct ubiblock, GFP_KERNEL);
+	dev = kzalloc_obj(struct ubiblock);
 	if (!dev) {
 		ret = -ENOMEM;
 		goto out_unlock;
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index d7493b61bee4..674ad87809df 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -930,7 +930,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
 		}
 	}
 
-	ubi = kzalloc_obj(struct ubi_device, GFP_KERNEL);
+	ubi = kzalloc_obj(struct ubi_device);
 	if (!ubi)
 		return -ENOMEM;
 
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index 0b233b6a2d9c..fd39030dbf89 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -727,7 +727,7 @@ static int rename_volumes(struct ubi_device *ubi,
 		int name_len = req->ents[i].name_len;
 		const char *name = req->ents[i].name;
 
-		re = kzalloc_obj(struct ubi_rename_entry, GFP_KERNEL);
+		re = kzalloc_obj(struct ubi_rename_entry);
 		if (!re) {
 			err = -ENOMEM;
 			goto out_free;
@@ -801,7 +801,7 @@ static int rename_volumes(struct ubi_device *ubi,
 			goto out_free;
 		}
 
-		re1 = kzalloc_obj(struct ubi_rename_entry, GFP_KERNEL);
+		re1 = kzalloc_obj(struct ubi_rename_entry);
 		if (!re1) {
 			err = -ENOMEM;
 			ubi_close_volume(desc);
@@ -1007,7 +1007,7 @@ static long ubi_cdev_ioctl(struct file *file, unsigned int cmd,
 		struct ubi_rnvol_req *req;
 
 		dbg_gen("re-name volumes");
-		req = kmalloc_obj(struct ubi_rnvol_req, GFP_KERNEL);
+		req = kmalloc_obj(struct ubi_rnvol_req);
 		if (!req) {
 			err = -ENOMEM;
 			break;
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index dbc448e2b7a6..35e047392d4a 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -124,11 +124,11 @@ struct ubi_eba_table *ubi_eba_create_table(struct ubi_volume *vol,
 	int err = -ENOMEM;
 	int i;
 
-	tbl = kzalloc_obj(*tbl, GFP_KERNEL);
+	tbl = kzalloc_obj(*tbl);
 	if (!tbl)
 		return ERR_PTR(-ENOMEM);
 
-	tbl->entries = kmalloc_objs(*tbl->entries, nentries, GFP_KERNEL);
+	tbl->entries = kmalloc_objs(*tbl->entries, nentries);
 	if (!tbl->entries)
 		goto err;
 
@@ -1535,11 +1535,11 @@ int self_check_eba(struct ubi_device *ubi, struct ubi_attach_info *ai_fastmap,
 
 	num_volumes = ubi->vtbl_slots + UBI_INT_VOL_COUNT;
 
-	scan_eba = kmalloc_objs(*scan_eba, num_volumes, GFP_KERNEL);
+	scan_eba = kmalloc_objs(*scan_eba, num_volumes);
 	if (!scan_eba)
 		return -ENOMEM;
 
-	fm_eba = kmalloc_objs(*fm_eba, num_volumes, GFP_KERNEL);
+	fm_eba = kmalloc_objs(*fm_eba, num_volumes);
 	if (!fm_eba) {
 		kfree(scan_eba);
 		return -ENOMEM;
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index 30953ff2ff52..3bce1b4d8464 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -889,13 +889,13 @@ int ubi_scan_fastmap(struct ubi_device *ubi, struct ubi_attach_info *ai,
 	down_write(&ubi->fm_protect);
 	memset(ubi->fm_buf, 0, ubi->fm_size);
 
-	fmsb = kmalloc_obj(*fmsb, GFP_KERNEL);
+	fmsb = kmalloc_obj(*fmsb);
 	if (!fmsb) {
 		ret = -ENOMEM;
 		goto out;
 	}
 
-	fm = kzalloc_obj(*fm, GFP_KERNEL);
+	fm = kzalloc_obj(*fm);
 	if (!fm) {
 		ret = -ENOMEM;
 		kfree(fmsb);
diff --git a/drivers/mtd/ubi/gluebi.c b/drivers/mtd/ubi/gluebi.c
index e56b4172264c..e3891ae82dfa 100644
--- a/drivers/mtd/ubi/gluebi.c
+++ b/drivers/mtd/ubi/gluebi.c
@@ -281,7 +281,7 @@ static int gluebi_create(struct ubi_device_info *di,
 	struct gluebi_device *gluebi, *g;
 	struct mtd_info *mtd;
 
-	gluebi = kzalloc_obj(struct gluebi_device, GFP_KERNEL);
+	gluebi = kzalloc_obj(struct gluebi_device);
 	if (!gluebi)
 		return -ENOMEM;
 
diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c
index 7cc239245e42..9626990f67cb 100644
--- a/drivers/mtd/ubi/kapi.c
+++ b/drivers/mtd/ubi/kapi.c
@@ -140,7 +140,7 @@ struct ubi_volume_desc *ubi_open_volume(int ubi_num, int vol_id, int mode)
 		goto out_put_ubi;
 	}
 
-	desc = kmalloc_obj(struct ubi_volume_desc, GFP_KERNEL);
+	desc = kmalloc_obj(struct ubi_volume_desc);
 	if (!desc) {
 		err = -ENOMEM;
 		goto out_put_ubi;
diff --git a/drivers/mtd/ubi/nvmem.c b/drivers/mtd/ubi/nvmem.c
index bc2cfb355d5c..2dade9727cf2 100644
--- a/drivers/mtd/ubi/nvmem.c
+++ b/drivers/mtd/ubi/nvmem.c
@@ -75,7 +75,7 @@ static int ubi_nvmem_add(struct ubi_volume_info *vi)
 	    WARN_ON_ONCE(vi->size <= 0))
 		return -EINVAL;
 
-	unv = kzalloc_obj(struct ubi_nvmem, GFP_KERNEL);
+	unv = kzalloc_obj(struct ubi_nvmem);
 	if (!unv)
 		return -ENOMEM;
 
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index ffec2c649698..50192b95b6e4 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -172,7 +172,7 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req)
 	if (ubi->ro_mode)
 		return -EROFS;
 
-	vol = kzalloc_obj(struct ubi_volume, GFP_KERNEL);
+	vol = kzalloc_obj(struct ubi_volume);
 	if (!vol)
 		return -ENOMEM;
 
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index 74427a03e896..06d87a3013a5 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -531,7 +531,7 @@ static int init_volumes(struct ubi_device *ubi,
 		if (be32_to_cpu(vtbl[i].reserved_pebs) == 0)
 			continue; /* Empty record */
 
-		vol = kzalloc_obj(struct ubi_volume, GFP_KERNEL);
+		vol = kzalloc_obj(struct ubi_volume);
 		if (!vol)
 			return -ENOMEM;
 
@@ -623,7 +623,7 @@ static int init_volumes(struct ubi_device *ubi,
 	}
 
 	/* And add the layout volume */
-	vol = kzalloc_obj(struct ubi_volume, GFP_KERNEL);
+	vol = kzalloc_obj(struct ubi_volume);
 	if (!vol)
 		return -ENOMEM;