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

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index cc86a2b76a0a..3181c06d91ce 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -868,7 +868,7 @@ int dasd_profile_on(struct dasd_profile *profile)
 {
 	struct dasd_profile_info *data;
 
-	data = kzalloc_obj(*data, GFP_KERNEL);
+	data = kzalloc_obj(*data);
 	if (!data)
 		return -ENOMEM;
 	spin_lock_bh(&profile->lock);
@@ -3180,7 +3180,7 @@ enum blk_eh_timer_return dasd_times_out(struct request *req)
 static int dasd_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
 			  unsigned int idx)
 {
-	struct dasd_queue *dq = kzalloc_obj(*dq, GFP_KERNEL);
+	struct dasd_queue *dq = kzalloc_obj(*dq);
 
 	if (!dq)
 		return -ENOMEM;
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
index f5f3b6da2d4b..8d6c16d35c22 100644
--- a/drivers/s390/block/dasd_alias.c
+++ b/drivers/s390/block/dasd_alias.c
@@ -98,7 +98,7 @@ static struct alias_server *_allocate_server(struct dasd_uid *uid)
 {
 	struct alias_server *server;
 
-	server = kzalloc_obj(*server, GFP_KERNEL);
+	server = kzalloc_obj(*server);
 	if (!server)
 		return ERR_PTR(-ENOMEM);
 	memcpy(server->uid.vendor, uid->vendor, sizeof(uid->vendor));
@@ -117,7 +117,7 @@ static struct alias_lcu *_allocate_lcu(struct dasd_uid *uid)
 {
 	struct alias_lcu *lcu;
 
-	lcu = kzalloc_obj(*lcu, GFP_KERNEL);
+	lcu = kzalloc_obj(*lcu);
 	if (!lcu)
 		return ERR_PTR(-ENOMEM);
 	lcu->uac = kzalloc_obj(*(lcu->uac), GFP_KERNEL | GFP_DMA);
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index d46274ef2f3e..381d616ad433 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -412,7 +412,7 @@ dasd_add_busid(const char *bus_id, int features)
 	struct dasd_devmap *devmap, *new, *tmp;
 	int hash;
 
-	new = kzalloc_obj(struct dasd_devmap, GFP_KERNEL);
+	new = kzalloc_obj(struct dasd_devmap);
 	if (!new)
 		return ERR_PTR(-ENOMEM);
 	spin_lock(&dasd_devmap_lock);
@@ -605,7 +605,7 @@ static int dasd_devmap_get_pprc_status(struct dasd_device *device,
 		dev_warn(&device->cdev->dev, "Unable to query copy relation status\n");
 		return -EOPNOTSUPP;
 	}
-	temp = kzalloc_obj(*temp, GFP_KERNEL);
+	temp = kzalloc_obj(*temp);
 	if (!temp)
 		return -ENOMEM;
 
@@ -2274,7 +2274,7 @@ static ssize_t dasd_copy_pair_store(struct device *dev,
 	} else if (sec_devmap->copy) {
 		copy = sec_devmap->copy;
 	} else {
-		copy = kzalloc_obj(*copy, GFP_KERNEL);
+		copy = kzalloc_obj(*copy);
 		if (!copy)
 			return -ENOMEM;
 	}
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index ac15322a1d06..af68c2ee659d 100644
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -325,7 +325,7 @@ dasd_diag_check_device(struct dasd_device *device)
 	int rc;
 
 	if (private == NULL) {
-		private = kzalloc_obj(*private, GFP_KERNEL);
+		private = kzalloc_obj(*private);
 		if (private == NULL) {
 			DBF_DEV_EVENT(DBF_WARNING, device, "%s",
 				"Allocating memory for private DASD data "
@@ -395,7 +395,7 @@ dasd_diag_check_device(struct dasd_device *device)
 		rc = -ENOMEM;
 		goto out;
 	}
-	bio = kzalloc_obj(*bio, GFP_KERNEL);
+	bio = kzalloc_obj(*bio);
 	if (bio == NULL)  {
 		DBF_DEV_EVENT(DBF_WARNING, device, "%s",
 			      "No memory to allocate initialization bio");
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 47ffc255e9b4..cb068d5e2145 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -3729,7 +3729,7 @@ static int dasd_in_copy_relation(struct dasd_device *device)
 	if (!dasd_eckd_pprc_enabled(device))
 		return 0;
 
-	temp = kzalloc_obj(*temp, GFP_KERNEL);
+	temp = kzalloc_obj(*temp);
 	if (!temp)
 		return -ENOMEM;
 
@@ -6721,7 +6721,7 @@ static void dasd_eckd_check_attention_work(struct work_struct *work)
 
 	data = container_of(work, struct check_attention_work_data, worker);
 	device = data->device;
-	messages = kzalloc_obj(*messages, GFP_KERNEL);
+	messages = kzalloc_obj(*messages);
 	if (!messages) {
 		DBF_DEV_EVENT(DBF_WARNING, device, "%s",
 			      "Could not allocate attention message buffer");
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index 648ab74ae60f..78d66e2711cd 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -544,7 +544,7 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
 	struct eerbuffer *eerb;
 	unsigned long flags;
 
-	eerb = kzalloc_obj(struct eerbuffer, GFP_KERNEL);
+	eerb = kzalloc_obj(struct eerbuffer);
 	if (!eerb)
 		return -ENOMEM;
 	eerb->buffer_page_count = eer_pages;
@@ -689,7 +689,7 @@ int __init dasd_eer_init(void)
 {
 	int rc;
 
-	dasd_eer_dev = kzalloc_obj(*dasd_eer_dev, GFP_KERNEL);
+	dasd_eer_dev = kzalloc_obj(*dasd_eer_dev);
 	if (!dasd_eer_dev)
 		return -ENOMEM;
 
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index d5534ce25558..c85ee42732a3 100644
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -442,7 +442,7 @@ static int dasd_ioctl_read_profile(struct dasd_block *block, void __user *argp)
 	struct dasd_profile_info_t *data;
 	int rc = 0;
 
-	data = kmalloc_obj(*data, GFP_KERNEL);
+	data = kmalloc_obj(*data);
 	if (!data)
 		return -ENOMEM;
 
@@ -560,7 +560,7 @@ static int dasd_ioctl_information(struct dasd_block *block, void __user *argp,
 	struct dasd_information2_t *dasd_info;
 	int error;
 
-	dasd_info = kzalloc_obj(*dasd_info, GFP_KERNEL);
+	dasd_info = kzalloc_obj(*dasd_info);
 	if (!dasd_info)
 		return -ENOMEM;
 
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 5d7229f39480..e8407338697c 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -309,7 +309,7 @@ dcssblk_load_segment(char *name, struct segment_info **seg_info)
 		return -EEXIST;
 
 	/* get a struct segment_info */
-	*seg_info = kzalloc_obj(struct segment_info, GFP_KERNEL);
+	*seg_info = kzalloc_obj(struct segment_info);
 	if (*seg_info == NULL)
 		return -ENOMEM;
 
diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c
index 0781c7e9d913..2ffd47b6a997 100644
--- a/drivers/s390/block/scm_blk.c
+++ b/drivers/s390/block/scm_blk.c
@@ -331,7 +331,7 @@ static blk_status_t scm_blk_request(struct blk_mq_hw_ctx *hctx,
 static int scm_blk_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
 			     unsigned int idx)
 {
-	struct scm_queue *qd = kzalloc_obj(*qd, GFP_KERNEL);
+	struct scm_queue *qd = kzalloc_obj(*qd);
 
 	if (!qd)
 		return -ENOMEM;
diff --git a/drivers/s390/block/scm_drv.c b/drivers/s390/block/scm_drv.c
index 81b32b44b03c..095d06eeae7c 100644
--- a/drivers/s390/block/scm_drv.c
+++ b/drivers/s390/block/scm_drv.c
@@ -43,7 +43,7 @@ static int scm_probe(struct scm_device *scmdev)
 	if (scmdev->attrs.oper_state != OP_STATE_GOOD)
 		return -EINVAL;
 
-	bdev = kzalloc_obj(*bdev, GFP_KERNEL);
+	bdev = kzalloc_obj(*bdev);
 	if (!bdev)
 		return -ENOMEM;