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>

8 files changed, 12 insertions, 12 deletions

diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index dc6d9afdd5c6..d6f54ccaf93b 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -328,7 +328,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
 		return ERR_PTR(-EINVAL);
 
 	/* Initialize a clock structure. */
-	ptp = kzalloc_obj(struct ptp_clock, GFP_KERNEL);
+	ptp = kzalloc_obj(struct ptp_clock);
 	if (!ptp) {
 		err = -ENOMEM;
 		goto no_memory;
@@ -344,7 +344,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
 	ptp->devid = MKDEV(major, index);
 	ptp->index = index;
 	INIT_LIST_HEAD(&ptp->tsevqs);
-	queue = kzalloc_obj(*queue, GFP_KERNEL);
+	queue = kzalloc_obj(*queue);
 	if (!queue) {
 		err = -ENOMEM;
 		goto no_memory_queue;
diff --git a/drivers/ptp/ptp_ines.c b/drivers/ptp/ptp_ines.c
index 67eda6fb22d1..9e7af6a10261 100644
--- a/drivers/ptp/ptp_ines.c
+++ b/drivers/ptp/ptp_ines.c
@@ -760,7 +760,7 @@ static int ines_ptp_ctrl_probe(struct platform_device *pld)
 		err = PTR_ERR(addr);
 		goto out;
 	}
-	clock = kzalloc_obj(*clock, GFP_KERNEL);
+	clock = kzalloc_obj(*clock);
 	if (!clock) {
 		err = -ENOMEM;
 		goto out;
diff --git a/drivers/ptp/ptp_mock.c b/drivers/ptp/ptp_mock.c
index 267168e9d0ca..4d66b6147121 100644
--- a/drivers/ptp/ptp_mock.c
+++ b/drivers/ptp/ptp_mock.c
@@ -120,7 +120,7 @@ struct mock_phc *mock_phc_create(struct device *dev)
 	struct mock_phc *phc;
 	int err;
 
-	phc = kzalloc_obj(*phc, GFP_KERNEL);
+	phc = kzalloc_obj(*phc);
 	if (!phc) {
 		err = -ENOMEM;
 		goto out;
diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
index 1ed492c12e1d..d88ab2f86b1b 100644
--- a/drivers/ptp/ptp_ocp.c
+++ b/drivers/ptp/ptp_ocp.c
@@ -2241,7 +2241,7 @@ ptp_ocp_register_ext(struct ptp_ocp *bp, struct ocp_resource *r)
 	struct ptp_ocp_ext_src *ext;
 	int err;
 
-	ext = kzalloc_obj(*ext, GFP_KERNEL);
+	ext = kzalloc_obj(*ext);
 	if (!ext)
 		return -ENOMEM;
 
@@ -2378,7 +2378,7 @@ ptp_ocp_attr_group_add(struct ptp_ocp *bp,
 		if (attr_tbl[i].cap & bp->fw_cap)
 			count++;
 
-	bp->attr_group = kzalloc_objs(*bp->attr_group, count + 1, GFP_KERNEL);
+	bp->attr_group = kzalloc_objs(*bp->attr_group, count + 1);
 	if (!bp->attr_group)
 		return -ENOMEM;
 
@@ -2645,7 +2645,7 @@ ptp_ocp_set_pins(struct ptp_ocp *bp)
 	struct ptp_pin_desc *config;
 	int i;
 
-	config = kzalloc_objs(*config, 4, GFP_KERNEL);
+	config = kzalloc_objs(*config, 4);
 	if (!config)
 		return -ENOMEM;
 
diff --git a/drivers/ptp/ptp_qoriq.c b/drivers/ptp/ptp_qoriq.c
index 71f4de4e8fc3..76272e5ac5b8 100644
--- a/drivers/ptp/ptp_qoriq.c
+++ b/drivers/ptp/ptp_qoriq.c
@@ -613,7 +613,7 @@ static int ptp_qoriq_probe(struct platform_device *dev)
 	int err = -ENOMEM;
 	void __iomem *base;
 
-	ptp_qoriq = kzalloc_obj(*ptp_qoriq, GFP_KERNEL);
+	ptp_qoriq = kzalloc_obj(*ptp_qoriq);
 	if (!ptp_qoriq)
 		goto no_memory;
 
diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
index f398eac4a263..dc398c6b7528 100644
--- a/drivers/ptp/ptp_sysfs.c
+++ b/drivers/ptp/ptp_sysfs.c
@@ -443,11 +443,11 @@ int ptp_populate_pin_groups(struct ptp_clock *ptp)
 	if (!n_pins)
 		return 0;
 
-	ptp->pin_dev_attr = kzalloc_objs(*ptp->pin_dev_attr, n_pins, GFP_KERNEL);
+	ptp->pin_dev_attr = kzalloc_objs(*ptp->pin_dev_attr, n_pins);
 	if (!ptp->pin_dev_attr)
 		goto no_dev_attr;
 
-	ptp->pin_attr = kzalloc_objs(*ptp->pin_attr, 1 + n_pins, GFP_KERNEL);
+	ptp->pin_attr = kzalloc_objs(*ptp->pin_attr, 1 + n_pins);
 	if (!ptp->pin_attr)
 		goto no_pin_attr;
 
diff --git a/drivers/ptp/ptp_vclock.c b/drivers/ptp/ptp_vclock.c
index b27b25715e1e..915a4f6defc9 100644
--- a/drivers/ptp/ptp_vclock.c
+++ b/drivers/ptp/ptp_vclock.c
@@ -191,7 +191,7 @@ struct ptp_vclock *ptp_vclock_register(struct ptp_clock *pclock)
 {
 	struct ptp_vclock *vclock;
 
-	vclock = kzalloc_obj(*vclock, GFP_KERNEL);
+	vclock = kzalloc_obj(*vclock);
 	if (!vclock)
 		return NULL;
 
diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c
index 431510435376..8b630eb916b5 100644
--- a/drivers/ptp/ptp_vmclock.c
+++ b/drivers/ptp/ptp_vmclock.c
@@ -460,7 +460,7 @@ static int vmclock_miscdev_open(struct inode *inode, struct file *fp)
 {
 	struct vmclock_state *st = container_of(fp->private_data,
 						struct vmclock_state, miscdev);
-	struct vmclock_file_state *fst = kzalloc_obj(*fst, GFP_KERNEL);
+	struct vmclock_file_state *fst = kzalloc_obj(*fst);
 
 	if (!fst)
 		return -ENOMEM;