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>

2 files changed, 11 insertions, 11 deletions

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index fe0f633bc655..fc049612d6dc 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -1318,7 +1318,7 @@ static int cdrom_slot_status(struct cdrom_device_info *cdi, int slot)
 	if (cdi->sanyo_slot)
 		return CDS_NO_INFO;
 	
-	info = kmalloc_obj(*info, GFP_KERNEL);
+	info = kmalloc_obj(*info);
 	if (!info)
 		return -ENOMEM;
 
@@ -1347,7 +1347,7 @@ int cdrom_number_of_slots(struct cdrom_device_info *cdi)
 	/* cdrom_read_mech_status requires a valid value for capacity: */
 	cdi->capacity = 0; 
 
-	info = kmalloc_obj(*info, GFP_KERNEL);
+	info = kmalloc_obj(*info);
 	if (!info)
 		return -ENOMEM;
 
@@ -1406,7 +1406,7 @@ static int cdrom_select_disc(struct cdrom_device_info *cdi, int slot)
 		return cdrom_load_unload(cdi, -1);
 	}
 
-	info = kmalloc_obj(*info, GFP_KERNEL);
+	info = kmalloc_obj(*info);
 	if (!info)
 		return -ENOMEM;
 
@@ -2311,7 +2311,7 @@ static int cdrom_ioctl_media_changed(struct cdrom_device_info *cdi,
 	/* Prevent arg from speculatively bypassing the length check */
 	arg = array_index_nospec(arg, cdi->capacity);
 
-	info = kmalloc_obj(*info, GFP_KERNEL);
+	info = kmalloc_obj(*info);
 	if (!info)
 		return -ENOMEM;
 
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 1a59241cbd23..4ba4dd06cbf4 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -227,7 +227,7 @@ static char gdrom_execute_diagnostic(void)
 static int gdrom_preparedisk_cmd(void)
 {
 	struct packet_command *spin_command;
-	spin_command = kzalloc_obj(struct packet_command, GFP_KERNEL);
+	spin_command = kzalloc_obj(struct packet_command);
 	if (!spin_command)
 		return -ENOMEM;
 	spin_command->cmd[0] = 0x70;
@@ -261,7 +261,7 @@ static int gdrom_readtoc_cmd(struct gdromtoc *toc, int session)
 	struct packet_command *toc_command;
 	int err = 0;
 
-	toc_command = kzalloc_obj(struct packet_command, GFP_KERNEL);
+	toc_command = kzalloc_obj(struct packet_command);
 	if (!toc_command)
 		return -ENOMEM;
 	tocsize = sizeof(struct gdromtoc);
@@ -415,7 +415,7 @@ static int gdrom_getsense(short *bufstring)
 	int sense_key;
 	int err = -EIO;
 
-	sense_command = kzalloc_obj(struct packet_command, GFP_KERNEL);
+	sense_command = kzalloc_obj(struct packet_command);
 	if (!sense_command)
 		return -ENOMEM;
 	sense_command->cmd[0] = 0x13;
@@ -574,7 +574,7 @@ static blk_status_t gdrom_readdisk_dma(struct request *req)
 	struct packet_command *read_command;
 	unsigned long timeout;
 
-	read_command = kzalloc_obj(struct packet_command, GFP_KERNEL);
+	read_command = kzalloc_obj(struct packet_command);
 	if (!read_command)
 		return BLK_STS_RESOURCE;
 
@@ -656,7 +656,7 @@ static int gdrom_outputversion(void)
 	int err = -ENOMEM;
 
 	/* query device ID */
-	id = kzalloc_obj(struct gdrom_id, GFP_KERNEL);
+	id = kzalloc_obj(struct gdrom_id);
 	if (!id)
 		return err;
 	gdrom_identifydevice(id);
@@ -769,7 +769,7 @@ static int probe_gdrom(struct platform_device *devptr)
 	pr_info("Registered with major number %d\n",
 		gdrom_major);
 	/* Specify basic properties of drive */
-	gd.cd_info = kzalloc_obj(struct cdrom_device_info, GFP_KERNEL);
+	gd.cd_info = kzalloc_obj(struct cdrom_device_info);
 	if (!gd.cd_info) {
 		err = -ENOMEM;
 		goto probe_fail_no_mem;
@@ -803,7 +803,7 @@ static int probe_gdrom(struct platform_device *devptr)
 	if (err)
 		goto probe_fail_free_irqs;
 
-	gd.toc = kzalloc_obj(struct gdromtoc, GFP_KERNEL);
+	gd.toc = kzalloc_obj(struct gdromtoc);
 	if (!gd.toc) {
 		err = -ENOMEM;
 		goto probe_fail_free_irqs;