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>

5 files changed, 9 insertions, 9 deletions

diff --git a/drivers/scsi/csiostor/csio_hw.c b/drivers/scsi/csiostor/csio_hw.c
index 03299d5e523a..df9f81f29950 100644
--- a/drivers/scsi/csiostor/csio_hw.c
+++ b/drivers/scsi/csiostor/csio_hw.c
@@ -2429,7 +2429,7 @@ csio_hw_flash_fw(struct csio_hw *hw, int *reset)
 	/* allocate memory to read the header of the firmware on the
 	 * card
 	 */
-	card_fw = kmalloc_obj(*card_fw, GFP_KERNEL);
+	card_fw = kmalloc_obj(*card_fw);
 	if (!card_fw)
 		return -ENOMEM;
 
@@ -4389,7 +4389,7 @@ csio_hw_init(struct csio_hw *hw)
 	INIT_LIST_HEAD(&hw->evt_free_q);
 	for (i = 0; i < csio_evtq_sz; i++) {
 
-		evt_entry = kzalloc_obj(struct csio_evt_msg, GFP_KERNEL);
+		evt_entry = kzalloc_obj(struct csio_evt_msg);
 		if (!evt_entry) {
 			rv = -ENOMEM;
 			csio_err(hw, "Failed to initialize eventq");
diff --git a/drivers/scsi/csiostor/csio_init.c b/drivers/scsi/csiostor/csio_init.c
index 1d2fcccb46c2..238431524801 100644
--- a/drivers/scsi/csiostor/csio_init.c
+++ b/drivers/scsi/csiostor/csio_init.c
@@ -516,7 +516,7 @@ static struct csio_hw *csio_hw_alloc(struct pci_dev *pdev)
 {
 	struct csio_hw *hw;
 
-	hw = kzalloc_obj(struct csio_hw, GFP_KERNEL);
+	hw = kzalloc_obj(struct csio_hw);
 	if (!hw)
 		goto err;
 
diff --git a/drivers/scsi/csiostor/csio_lnode.c b/drivers/scsi/csiostor/csio_lnode.c
index cdd61b990c64..3e201f2c56da 100644
--- a/drivers/scsi/csiostor/csio_lnode.c
+++ b/drivers/scsi/csiostor/csio_lnode.c
@@ -1837,7 +1837,7 @@ csio_ln_fdmi_init(struct csio_lnode *ln)
 	struct csio_dma_buf	*dma_buf;
 
 	/* Allocate MGMT request required for FDMI */
-	ln->mgmt_req = kzalloc_obj(struct csio_ioreq, GFP_KERNEL);
+	ln->mgmt_req = kzalloc_obj(struct csio_ioreq);
 	if (!ln->mgmt_req) {
 		csio_ln_err(ln, "Failed to alloc ioreq for FDMI\n");
 		CSIO_INC_STATS(hw, n_err_nomem);
@@ -2002,7 +2002,7 @@ csio_ln_init(struct csio_lnode *ln)
 
 		/* This is the lnode used during initialization */
 
-		ln->fcfinfo = kzalloc_obj(struct csio_fcf_info, GFP_KERNEL);
+		ln->fcfinfo = kzalloc_obj(struct csio_fcf_info);
 		if (!ln->fcfinfo) {
 			csio_ln_err(ln, "Failed to alloc FCF record\n");
 			CSIO_INC_STATS(hw, n_err_nomem);
diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c
index 2c75c2663f73..b1de615cf316 100644
--- a/drivers/scsi/csiostor/csio_scsi.c
+++ b/drivers/scsi/csiostor/csio_scsi.c
@@ -2341,7 +2341,7 @@ csio_scsi_alloc_ddp_bufs(struct csio_scsim *scm, struct csio_hw *hw,
 	for (n = 0; n < num_buf; n++) {
 		/* Set unit size to request size */
 		unit_size = buf_size;
-		ddp_desc = kzalloc_obj(struct csio_dma_buf, GFP_KERNEL);
+		ddp_desc = kzalloc_obj(struct csio_dma_buf);
 		if (!ddp_desc) {
 			csio_err(hw,
 				 "Failed to allocate ddp descriptors,"
@@ -2435,7 +2435,7 @@ csio_scsim_init(struct csio_scsim *scm, struct csio_hw *hw)
 	INIT_LIST_HEAD(&scm->ioreq_freelist);
 	for (i = 0; i < csio_scsi_ioreqs; i++) {
 
-		ioreq = kzalloc_obj(struct csio_ioreq, GFP_KERNEL);
+		ioreq = kzalloc_obj(struct csio_ioreq);
 		if (!ioreq) {
 			csio_err(hw,
 				 "I/O request element allocation failed, "
diff --git a/drivers/scsi/csiostor/csio_wr.c b/drivers/scsi/csiostor/csio_wr.c
index 0310fa71ab07..4769e39a8b64 100644
--- a/drivers/scsi/csiostor/csio_wr.c
+++ b/drivers/scsi/csiostor/csio_wr.c
@@ -1650,12 +1650,12 @@ csio_wrm_init(struct csio_wrm *wrm, struct csio_hw *hw)
 		return -EINVAL;
 	}
 
-	wrm->q_arr = kzalloc_objs(struct csio_q *, wrm->num_q, GFP_KERNEL);
+	wrm->q_arr = kzalloc_objs(struct csio_q *, wrm->num_q);
 	if (!wrm->q_arr)
 		goto err;
 
 	for (i = 0; i < wrm->num_q; i++) {
-		wrm->q_arr[i] = kzalloc_obj(struct csio_q, GFP_KERNEL);
+		wrm->q_arr[i] = kzalloc_obj(struct csio_q);
 		if (!wrm->q_arr[i]) {
 			while (--i >= 0)
 				kfree(wrm->q_arr[i]);