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>

10 files changed, 19 insertions, 19 deletions

diff --git a/drivers/nfc/mei_phy.c b/drivers/nfc/mei_phy.c
index 5f8c9c2c7c06..0ea28597e6f5 100644
--- a/drivers/nfc/mei_phy.c
+++ b/drivers/nfc/mei_phy.c
@@ -373,7 +373,7 @@ struct nfc_mei_phy *nfc_mei_phy_alloc(struct mei_cl_device *cldev)
 {
 	struct nfc_mei_phy *phy;
 
-	phy = kzalloc_obj(struct nfc_mei_phy, GFP_KERNEL);
+	phy = kzalloc_obj(struct nfc_mei_phy);
 	if (!phy)
 		return NULL;
 
diff --git a/drivers/nfc/microread/microread.c b/drivers/nfc/microread/microread.c
index 60cdf4d09577..4149c5d735bd 100644
--- a/drivers/nfc/microread/microread.c
+++ b/drivers/nfc/microread/microread.c
@@ -473,7 +473,7 @@ static void microread_target_discovered(struct nfc_hci_dev *hdev, u8 gate,
 
 	pr_info("target discovered to gate 0x%x\n", gate);
 
-	targets = kzalloc_obj(struct nfc_target, GFP_KERNEL);
+	targets = kzalloc_obj(struct nfc_target);
 	if (targets == NULL) {
 		r = -ENOMEM;
 		goto exit;
@@ -650,7 +650,7 @@ int microread_probe(void *phy_id, const struct nfc_phy_ops *phy_ops,
 	struct nfc_hci_init_data init_data;
 	int r;
 
-	info = kzalloc_obj(struct microread_info, GFP_KERNEL);
+	info = kzalloc_obj(struct microread_info);
 	if (!info) {
 		r = -ENOMEM;
 		goto err_info_alloc;
diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index 2065befd3793..c51d22e4579c 100644
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -101,7 +101,7 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(enum nfcmrvl_phy phy,
 	int tailroom;
 	u32 protocols;
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/nfc/nfcsim.c b/drivers/nfc/nfcsim.c
index 6b2939e6a7cd..f8e5c4da3b13 100644
--- a/drivers/nfc/nfcsim.c
+++ b/drivers/nfc/nfcsim.c
@@ -66,7 +66,7 @@ static struct nfcsim_link *nfcsim_link_new(void)
 {
 	struct nfcsim_link *link;
 
-	link = kzalloc_obj(struct nfcsim_link, GFP_KERNEL);
+	link = kzalloc_obj(struct nfcsim_link);
 	if (!link)
 		return NULL;
 
@@ -373,7 +373,7 @@ static struct nfcsim *nfcsim_device_new(struct nfcsim_link *link_in,
 	struct nfcsim *dev;
 	int rc;
 
-	dev = kzalloc_obj(struct nfcsim, GFP_KERNEL);
+	dev = kzalloc_obj(struct nfcsim);
 	if (!dev)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c
index 8d62084c3e92..d7bdbc82e2ba 100644
--- a/drivers/nfc/pn533/pn533.c
+++ b/drivers/nfc/pn533/pn533.c
@@ -444,7 +444,7 @@ static int __pn533_send_async(struct pn533 *dev, u8 cmd_code,
 
 	dev_dbg(dev->dev, "Sending command 0x%x\n", cmd_code);
 
-	cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+	cmd = kzalloc_obj(*cmd);
 	if (!cmd)
 		return -ENOMEM;
 
@@ -518,7 +518,7 @@ static int pn533_send_cmd_direct_async(struct pn533 *dev, u8 cmd_code,
 	struct pn533_cmd *cmd;
 	int rc;
 
-	cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+	cmd = kzalloc_obj(*cmd);
 	if (!cmd)
 		return -ENOMEM;
 
@@ -2019,7 +2019,7 @@ static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target,
 		*next = 0;
 	}
 
-	arg = kmalloc_obj(*arg, GFP_KERNEL);
+	arg = kmalloc_obj(*arg);
 	if (!arg) {
 		dev_kfree_skb(skb);
 		return -ENOMEM;
@@ -2266,7 +2266,7 @@ static int pn533_transceive(struct nfc_dev *nfc_dev,
 		goto error;
 	}
 
-	arg = kmalloc_obj(*arg, GFP_KERNEL);
+	arg = kmalloc_obj(*arg);
 	if (!arg) {
 		rc = -ENOMEM;
 		goto error;
@@ -2744,7 +2744,7 @@ struct pn533 *pn53x_common_init(u32 device_type,
 {
 	struct pn533 *priv;
 
-	priv = kzalloc_obj(*priv, GFP_KERNEL);
+	priv = kzalloc_obj(*priv);
 	if (!priv)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/nfc/pn533/uart.c b/drivers/nfc/pn533/uart.c
index 3355736e5e26..6d2f520a5bc8 100644
--- a/drivers/nfc/pn533/uart.c
+++ b/drivers/nfc/pn533/uart.c
@@ -242,7 +242,7 @@ static int pn532_uart_probe(struct serdev_device *serdev)
 	int err;
 
 	err = -ENOMEM;
-	pn532 = kzalloc_obj(*pn532, GFP_KERNEL);
+	pn532 = kzalloc_obj(*pn532);
 	if (!pn532)
 		goto err_exit;
 
diff --git a/drivers/nfc/pn544/pn544.c b/drivers/nfc/pn544/pn544.c
index 87803f125f5e..9d0a16ac465e 100644
--- a/drivers/nfc/pn544/pn544.c
+++ b/drivers/nfc/pn544/pn544.c
@@ -910,7 +910,7 @@ int pn544_hci_probe(void *phy_id, const struct nfc_phy_ops *phy_ops,
 	struct nfc_hci_init_data init_data;
 	int r;
 
-	info = kzalloc_obj(struct pn544_hci_info, GFP_KERNEL);
+	info = kzalloc_obj(struct pn544_hci_info);
 	if (!info) {
 		r = -ENOMEM;
 		goto err_info_alloc;
diff --git a/drivers/nfc/port100.c b/drivers/nfc/port100.c
index 3dcd13878535..a922569d7b48 100644
--- a/drivers/nfc/port100.c
+++ b/drivers/nfc/port100.c
@@ -859,7 +859,7 @@ static int port100_send_cmd_async(struct port100 *dev, u8 cmd_code,
 	if (!resp)
 		return -ENOMEM;
 
-	cmd = kzalloc_obj(*cmd, GFP_KERNEL);
+	cmd = kzalloc_obj(*cmd);
 	if (!cmd) {
 		dev_kfree_skb(resp);
 		return -ENOMEM;
@@ -1211,7 +1211,7 @@ static int port100_in_send_cmd(struct nfc_digital_dev *ddev,
 	struct port100_cb_arg *cb_arg;
 	__le16 timeout;
 
-	cb_arg = kzalloc_obj(struct port100_cb_arg, GFP_KERNEL);
+	cb_arg = kzalloc_obj(struct port100_cb_arg);
 	if (!cb_arg)
 		return -ENOMEM;
 
@@ -1377,7 +1377,7 @@ static int port100_tg_send_cmd(struct nfc_digital_dev *ddev,
 	struct port100_tg_comm_rf_cmd *hdr;
 	struct port100_cb_arg *cb_arg;
 
-	cb_arg = kzalloc_obj(struct port100_cb_arg, GFP_KERNEL);
+	cb_arg = kzalloc_obj(struct port100_cb_arg);
 	if (!cb_arg)
 		return -ENOMEM;
 
@@ -1418,7 +1418,7 @@ static int port100_listen_mdaa(struct nfc_digital_dev *ddev,
 	if (rc)
 		return rc;
 
-	cb_arg = kzalloc_obj(struct port100_cb_arg, GFP_KERNEL);
+	cb_arg = kzalloc_obj(struct port100_cb_arg);
 	if (!cb_arg)
 		return -ENOMEM;
 
diff --git a/drivers/nfc/st21nfca/core.c b/drivers/nfc/st21nfca/core.c
index 31f6e7c9930f..fd39a05c9622 100644
--- a/drivers/nfc/st21nfca/core.c
+++ b/drivers/nfc/st21nfca/core.c
@@ -946,7 +946,7 @@ int st21nfca_hci_probe(void *phy_id, const struct nfc_phy_ops *phy_ops,
 	struct nfc_hci_init_data init_data;
 	unsigned long quirks = 0;
 
-	info = kzalloc_obj(struct st21nfca_hci_info, GFP_KERNEL);
+	info = kzalloc_obj(struct st21nfca_hci_info);
 	if (!info)
 		return -ENOMEM;
 
diff --git a/drivers/nfc/virtual_ncidev.c b/drivers/nfc/virtual_ncidev.c
index 81cc2e046ee6..8eeb447ac96e 100644
--- a/drivers/nfc/virtual_ncidev.c
+++ b/drivers/nfc/virtual_ncidev.c
@@ -135,7 +135,7 @@ static int virtual_ncidev_open(struct inode *inode, struct file *file)
 	int ret = 0;
 	struct virtual_nci_dev *vdev;
 
-	vdev = kzalloc_obj(*vdev, GFP_KERNEL);
+	vdev = kzalloc_obj(*vdev);
 	if (!vdev)
 		return -ENOMEM;
 	vdev->ndev = nci_allocate_device(&virtual_nci_ops,