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, 11 insertions, 11 deletions

diff --git a/drivers/net/wan/c101.c b/drivers/net/wan/c101.c
index 82ba8dfa979b..f35a15cf5dd9 100644
--- a/drivers/net/wan/c101.c
+++ b/drivers/net/wan/c101.c
@@ -313,7 +313,7 @@ static int __init c101_run(unsigned long irq, unsigned long winbase)
 		return -ENODEV;
 	}
 
-	card = kzalloc_obj(card_t, GFP_KERNEL);
+	card = kzalloc_obj(card_t);
 	if (!card)
 		return -ENOBUFS;
 
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 9f989b2ff558..957e0b272d54 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -2359,7 +2359,7 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	}
 
 	/* Allocate driver private data */
-	card = kzalloc_obj(struct fst_card_info, GFP_KERNEL);
+	card = kzalloc_obj(struct fst_card_info);
 	if (!card)
 		return -ENOMEM;
 
diff --git a/drivers/net/wan/framer/framer-core.c b/drivers/net/wan/framer/framer-core.c
index 66ed38e97336..d779b03a9e1b 100644
--- a/drivers/net/wan/framer/framer-core.c
+++ b/drivers/net/wan/framer/framer-core.c
@@ -615,7 +615,7 @@ struct framer *framer_create(struct device *dev, struct device_node *node,
 	if (WARN_ON((ops->flags & FRAMER_FLAG_POLL_STATUS) && !ops->get_status))
 		return ERR_PTR(-EINVAL);
 
-	framer = kzalloc_obj(*framer, GFP_KERNEL);
+	framer = kzalloc_obj(*framer);
 	if (!framer)
 		return ERR_PTR(-ENOMEM);
 
@@ -771,7 +771,7 @@ __framer_provider_of_register(struct device *dev, struct module *owner,
 {
 	struct framer_provider *framer_provider;
 
-	framer_provider = kzalloc_obj(*framer_provider, GFP_KERNEL);
+	framer_provider = kzalloc_obj(*framer_provider);
 	if (!framer_provider)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/net/wan/framer/pef2256/pef2256.c b/drivers/net/wan/framer/pef2256/pef2256.c
index f7ed6b3dd2d7..6938316bf82b 100644
--- a/drivers/net/wan/framer/pef2256/pef2256.c
+++ b/drivers/net/wan/framer/pef2256/pef2256.c
@@ -638,7 +638,7 @@ static int pef2256_add_audio_devices(struct pef2256 *pef2256)
 	if (!count)
 		return 0;
 
-	audio_devs = kzalloc_objs(*audio_devs, count, GFP_KERNEL);
+	audio_devs = kzalloc_objs(*audio_devs, count);
 	if (!audio_devs)
 		return -ENOMEM;
 
diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c
index 5e93e204da0c..f26233d4bcbb 100644
--- a/drivers/net/wan/fsl_ucc_hdlc.c
+++ b/drivers/net/wan/fsl_ucc_hdlc.c
@@ -898,7 +898,7 @@ static int uhdlc_suspend(struct device *dev)
 	priv->gumr = ioread32be(&uf_regs->gumr);
 	priv->guemr = ioread8(&uf_regs->guemr);
 
-	priv->ucc_pram_bak = kmalloc_obj(*priv->ucc_pram_bak, GFP_KERNEL);
+	priv->ucc_pram_bak = kmalloc_obj(*priv->ucc_pram_bak);
 	if (!priv->ucc_pram_bak)
 		return -ENOMEM;
 
@@ -1170,7 +1170,7 @@ static int ucc_hdlc_probe(struct platform_device *pdev)
 	ut_info->uf_info.regs = res.start;
 	ut_info->uf_info.irq = irq_of_parse_and_map(np, 0);
 
-	uhdlc_priv = kzalloc_obj(*uhdlc_priv, GFP_KERNEL);
+	uhdlc_priv = kzalloc_obj(*uhdlc_priv);
 	if (!uhdlc_priv)
 		return -ENOMEM;
 
@@ -1183,7 +1183,7 @@ static int ucc_hdlc_probe(struct platform_device *pdev)
 	uhdlc_priv->hdlc_bus = of_property_read_bool(np, "fsl,hdlc-bus");
 
 	if (uhdlc_priv->tsa == 1) {
-		utdm = kzalloc_obj(*utdm, GFP_KERNEL);
+		utdm = kzalloc_obj(*utdm);
 		if (!utdm) {
 			ret = -ENOMEM;
 			dev_err(&pdev->dev, "No mem to alloc ucc tdm data\n");
diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c
index 1892ee67bf20..0e405fb307f9 100644
--- a/drivers/net/wan/n2.c
+++ b/drivers/net/wan/n2.c
@@ -340,7 +340,7 @@ static int __init n2_run(unsigned long io, unsigned long irq,
 		return -ENODEV;
 	}
 
-	card = kzalloc_obj(card_t, GFP_KERNEL);
+	card = kzalloc_obj(card_t);
 	if (!card)
 		return -ENOBUFS;
 
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index 82ae9e1db51d..7e57d289b62c 100644
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -300,7 +300,7 @@ static int pc300_pci_init_one(struct pci_dev *pdev,
 		return i;
 	}
 
-	card = kzalloc_obj(card_t, GFP_KERNEL);
+	card = kzalloc_obj(card_t);
 	if (!card) {
 		pci_release_regions(pdev);
 		pci_disable_device(pdev);
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index 33f562919923..89f4b4584a33 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -281,7 +281,7 @@ static int pci200_pci_init_one(struct pci_dev *pdev,
 		return i;
 	}
 
-	card = kzalloc_obj(card_t, GFP_KERNEL);
+	card = kzalloc_obj(card_t);
 	if (!card) {
 		pci_release_regions(pdev);
 		pci_disable_device(pdev);