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/net/devlink/core.c b/net/devlink/core.c
index 44584f3613ca..0b020f69cef1 100644
--- a/net/devlink/core.c
+++ b/net/devlink/core.c
@@ -111,7 +111,7 @@ static struct devlink_rel *devlink_rel_alloc(void)
 	static u32 next;
 	int err;
 
-	rel = kzalloc_obj(*rel, GFP_KERNEL);
+	rel = kzalloc_obj(*rel);
 	if (!rel)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/net/devlink/dpipe.c b/net/devlink/dpipe.c
index 3b86dc25e7f2..c8d4a4374ae1 100644
--- a/net/devlink/dpipe.c
+++ b/net/devlink/dpipe.c
@@ -851,7 +851,7 @@ int devl_dpipe_table_register(struct devlink *devlink,
 				     devlink))
 		return -EEXIST;
 
-	table = kzalloc_obj(*table, GFP_KERNEL);
+	table = kzalloc_obj(*table);
 	if (!table)
 		return -ENOMEM;
 
diff --git a/net/devlink/health.c b/net/devlink/health.c
index 0578f7b460f5..449c7611c640 100644
--- a/net/devlink/health.c
+++ b/net/devlink/health.c
@@ -32,7 +32,7 @@ static struct devlink_fmsg *devlink_fmsg_alloc(void)
 {
 	struct devlink_fmsg *fmsg;
 
-	fmsg = kzalloc_obj(*fmsg, GFP_KERNEL);
+	fmsg = kzalloc_obj(*fmsg);
 	if (!fmsg)
 		return NULL;
 
@@ -119,7 +119,7 @@ __devlink_health_reporter_create(struct devlink *devlink,
 	if (WARN_ON(ops->default_burst_period && !ops->default_graceful_period))
 		return ERR_PTR(-EINVAL);
 
-	reporter = kzalloc_obj(*reporter, GFP_KERNEL);
+	reporter = kzalloc_obj(*reporter);
 	if (!reporter)
 		return ERR_PTR(-ENOMEM);
 
@@ -738,7 +738,7 @@ static void devlink_fmsg_nest_common(struct devlink_fmsg *fmsg, int attrtype)
 	if (fmsg->err)
 		return;
 
-	item = kzalloc_obj(*item, GFP_KERNEL);
+	item = kzalloc_obj(*item);
 	if (!item) {
 		fmsg->err = -ENOMEM;
 		return;
diff --git a/net/devlink/linecard.c b/net/devlink/linecard.c
index 110f1347b9c6..8315d35cb91d 100644
--- a/net/devlink/linecard.c
+++ b/net/devlink/linecard.c
@@ -404,7 +404,7 @@ static int devlink_linecard_types_init(struct devlink_linecard *linecard)
 	int i;
 
 	count = linecard->ops->types_count(linecard, linecard->priv);
-	linecard->types = kmalloc_objs(*linecard_type, count, GFP_KERNEL);
+	linecard->types = kmalloc_objs(*linecard_type, count);
 	if (!linecard->types)
 		return -ENOMEM;
 	linecard->types_count = count;
@@ -450,7 +450,7 @@ devl_linecard_create(struct devlink *devlink, unsigned int linecard_index,
 	if (devlink_linecard_index_exists(devlink, linecard_index))
 		return ERR_PTR(-EEXIST);
 
-	linecard = kzalloc_obj(*linecard, GFP_KERNEL);
+	linecard = kzalloc_obj(*linecard);
 	if (!linecard)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/net/devlink/param.c b/net/devlink/param.c
index 74adb0fdb5f7..cf95268da5b0 100644
--- a/net/devlink/param.c
+++ b/net/devlink/param.c
@@ -718,7 +718,7 @@ static int devlink_param_register(struct devlink *devlink,
 	else
 		WARN_ON(!param->get || !param->set);
 
-	param_item = kzalloc_obj(*param_item, GFP_KERNEL);
+	param_item = kzalloc_obj(*param_item);
 	if (!param_item)
 		return -ENOMEM;
 
diff --git a/net/devlink/rate.c b/net/devlink/rate.c
index 8d8a688ad140..41be2d6c2954 100644
--- a/net/devlink/rate.c
+++ b/net/devlink/rate.c
@@ -627,7 +627,7 @@ int devlink_nl_rate_new_doit(struct sk_buff *skb, struct genl_info *info)
 	else if (rate_node == ERR_PTR(-EINVAL))
 		return -EINVAL;
 
-	rate_node = kzalloc_obj(*rate_node, GFP_KERNEL);
+	rate_node = kzalloc_obj(*rate_node);
 	if (!rate_node)
 		return -ENOMEM;
 
@@ -721,7 +721,7 @@ devl_rate_node_create(struct devlink *devlink, void *priv, char *node_name,
 	if (!IS_ERR(rate_node))
 		return ERR_PTR(-EEXIST);
 
-	rate_node = kzalloc_obj(*rate_node, GFP_KERNEL);
+	rate_node = kzalloc_obj(*rate_node);
 	if (!rate_node)
 		return ERR_PTR(-ENOMEM);
 
@@ -766,7 +766,7 @@ int devl_rate_leaf_create(struct devlink_port *devlink_port, void *priv,
 	if (WARN_ON(devlink_port->devlink_rate))
 		return -EBUSY;
 
-	devlink_rate = kzalloc_obj(*devlink_rate, GFP_KERNEL);
+	devlink_rate = kzalloc_obj(*devlink_rate);
 	if (!devlink_rate)
 		return -ENOMEM;
 
diff --git a/net/devlink/region.c b/net/devlink/region.c
index 654e3766710f..5588e3d560b9 100644
--- a/net/devlink/region.c
+++ b/net/devlink/region.c
@@ -428,7 +428,7 @@ __devlink_region_snapshot_create(struct devlink_region *region,
 	if (devlink_region_snapshot_get_by_id(region, snapshot_id))
 		return -EEXIST;
 
-	snapshot = kzalloc_obj(*snapshot, GFP_KERNEL);
+	snapshot = kzalloc_obj(*snapshot);
 	if (!snapshot)
 		return -ENOMEM;
 
@@ -1055,7 +1055,7 @@ struct devlink_region *devl_region_create(struct devlink *devlink,
 	if (devlink_region_get_by_name(devlink, ops->name))
 		return ERR_PTR(-EEXIST);
 
-	region = kzalloc_obj(*region, GFP_KERNEL);
+	region = kzalloc_obj(*region);
 	if (!region)
 		return ERR_PTR(-ENOMEM);
 
@@ -1128,7 +1128,7 @@ devlink_port_region_create(struct devlink_port *port,
 		goto unlock;
 	}
 
-	region = kzalloc_obj(*region, GFP_KERNEL);
+	region = kzalloc_obj(*region);
 	if (!region) {
 		err = -ENOMEM;
 		goto unlock;
diff --git a/net/devlink/resource.c b/net/devlink/resource.c
index aa3621c28a00..351835a710b1 100644
--- a/net/devlink/resource.c
+++ b/net/devlink/resource.c
@@ -347,7 +347,7 @@ int devl_resource_register(struct devlink *devlink,
 	if (resource)
 		return -EEXIST;
 
-	resource = kzalloc_obj(*resource, GFP_KERNEL);
+	resource = kzalloc_obj(*resource);
 	if (!resource)
 		return -ENOMEM;
 
diff --git a/net/devlink/sb.c b/net/devlink/sb.c
index bcfeed079433..49fcbfe08f15 100644
--- a/net/devlink/sb.c
+++ b/net/devlink/sb.c
@@ -943,7 +943,7 @@ int devl_sb_register(struct devlink *devlink, unsigned int sb_index,
 	if (devlink_sb_index_exists(devlink, sb_index))
 		return -EEXIST;
 
-	devlink_sb = kzalloc_obj(*devlink_sb, GFP_KERNEL);
+	devlink_sb = kzalloc_obj(*devlink_sb);
 	if (!devlink_sb)
 		return -ENOMEM;
 	devlink_sb->index = sb_index;
diff --git a/net/devlink/trap.c b/net/devlink/trap.c
index e4255c0a6a30..8edb31654a68 100644
--- a/net/devlink/trap.c
+++ b/net/devlink/trap.c
@@ -1271,7 +1271,7 @@ devlink_trap_register(struct devlink *devlink,
 	if (devlink_trap_item_lookup(devlink, trap->name))
 		return -EEXIST;
 
-	trap_item = kzalloc_obj(*trap_item, GFP_KERNEL);
+	trap_item = kzalloc_obj(*trap_item);
 	if (!trap_item)
 		return -ENOMEM;
 
@@ -1545,7 +1545,7 @@ devlink_trap_group_register(struct devlink *devlink,
 	if (devlink_trap_group_item_lookup(devlink, group->name))
 		return -EEXIST;
 
-	group_item = kzalloc_obj(*group_item, GFP_KERNEL);
+	group_item = kzalloc_obj(*group_item);
 	if (!group_item)
 		return -ENOMEM;
 
@@ -1751,7 +1751,7 @@ devlink_trap_policer_register(struct devlink *devlink,
 	if (devlink_trap_policer_item_lookup(devlink, policer->id))
 		return -EEXIST;
 
-	policer_item = kzalloc_obj(*policer_item, GFP_KERNEL);
+	policer_item = kzalloc_obj(*policer_item);
 	if (!policer_item)
 		return -ENOMEM;