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>

4 files changed, 11 insertions, 11 deletions

diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index 254d56059863..7cfed24054d0 100644
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -892,7 +892,7 @@ static int dvb_dmxdev_add_pid(struct dmxdev *dmxdev,
 	    (!list_empty(&filter->feed.ts)))
 		return -EINVAL;
 
-	feed = kzalloc_obj(struct dmxdev_feed, GFP_KERNEL);
+	feed = kzalloc_obj(struct dmxdev_feed);
 	if (feed == NULL)
 		return -ENOMEM;
 
diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c
index d25d4522240a..1b91ebb8f667 100644
--- a/drivers/media/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb-core/dvb_ca_en50221.c
@@ -1880,7 +1880,7 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter,
 		return -EINVAL;
 
 	/* initialise the system data */
-	ca = kzalloc_obj(*ca, GFP_KERNEL);
+	ca = kzalloc_obj(*ca);
 	if (!ca) {
 		ret = -ENOMEM;
 		goto exit;
@@ -1889,7 +1889,7 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter,
 	ca->pub = pubca;
 	ca->flags = flags;
 	ca->slot_count = slot_count;
-	ca->slot_info = kzalloc_objs(struct dvb_ca_slot, slot_count, GFP_KERNEL);
+	ca->slot_info = kzalloc_objs(struct dvb_ca_slot, slot_count);
 	if (!ca->slot_info) {
 		ret = -ENOMEM;
 		goto free_ca;
diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
index 6ba5857d280f..d082b6c57c76 100644
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -3021,7 +3021,7 @@ int dvb_register_frontend(struct dvb_adapter *dvb,
 	if (mutex_lock_interruptible(&frontend_mutex))
 		return -ERESTARTSYS;
 
-	fe->frontend_priv = kzalloc_obj(struct dvb_frontend_private, GFP_KERNEL);
+	fe->frontend_priv = kzalloc_obj(struct dvb_frontend_private);
 	if (!fe->frontend_priv) {
 		mutex_unlock(&frontend_mutex);
 		return -ENOMEM;
diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index 00476e7ee048..14f7018501cf 100644
--- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
@@ -328,14 +328,14 @@ static int dvb_create_media_entity(struct dvb_device *dvbdev,
 		return 0;
 	}
 
-	dvbdev->entity = kzalloc_obj(*dvbdev->entity, GFP_KERNEL);
+	dvbdev->entity = kzalloc_obj(*dvbdev->entity);
 	if (!dvbdev->entity)
 		return -ENOMEM;
 
 	dvbdev->entity->name = dvbdev->name;
 
 	if (npads) {
-		dvbdev->pads = kzalloc_objs(*dvbdev->pads, npads, GFP_KERNEL);
+		dvbdev->pads = kzalloc_objs(*dvbdev->pads, npads);
 		if (!dvbdev->pads) {
 			kfree(dvbdev->entity);
 			dvbdev->entity = NULL;
@@ -471,7 +471,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
 		return -ENFILE;
 	}
 
-	*pdvbdev = dvbdev = kzalloc_obj(*dvbdev, GFP_KERNEL);
+	*pdvbdev = dvbdev = kzalloc_obj(*dvbdev);
 	if (!dvbdev) {
 		mutex_unlock(&dvbdev_register_lock);
 		return -ENOMEM;
@@ -499,7 +499,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
 			return -ENOMEM;
 		}
 
-		new_node = kzalloc_obj(*new_node, GFP_KERNEL);
+		new_node = kzalloc_obj(*new_node);
 		if (!new_node) {
 			kfree(dvbdevfops);
 			kfree(dvbdev);
@@ -711,12 +711,12 @@ int dvb_create_media_graph(struct dvb_adapter *adap,
 		demod = NULL;
 
 	if (create_rf_connector) {
-		conn = kzalloc_obj(*conn, GFP_KERNEL);
+		conn = kzalloc_obj(*conn);
 		if (!conn)
 			return -ENOMEM;
 		adap->conn = conn;
 
-		adap->conn_pads = kzalloc_obj(*adap->conn_pads, GFP_KERNEL);
+		adap->conn_pads = kzalloc_obj(*adap->conn_pads);
 		if (!adap->conn_pads)
 			return -ENOMEM;
 
@@ -1026,7 +1026,7 @@ struct i2c_client *dvb_module_probe(const char *module_name,
 	struct i2c_client *client;
 	struct i2c_board_info *board_info;
 
-	board_info = kzalloc_obj(*board_info, GFP_KERNEL);
+	board_info = kzalloc_obj(*board_info);
 	if (!board_info)
 		return NULL;