change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/scsi/qla4xxx/ql4_mbx.c
..
..
@@ -1,8 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * QLogic iSCSI HBA Driver
3
4
  * Copyright (c)  2003-2013 QLogic Corporation
4
- *
5
- * See LICENSE.qla4xxx for copyright and licensing details.
6
5
  */
7
6
 
8
7
 #include <linux/ctype.h>
..
..
@@ -47,7 +46,7 @@
47
46
 /**
48
47
  * qla4xxx_is_intr_poll_mode – Are we allowed to poll for interrupts?
49
48
  * @ha: Pointer to host adapter structure.
50
- * @ret: 1=polling mode, 0=non-polling mode
49
+ * returns: 1=polling mode, 0=non-polling mode
51
50
  **/
52
51
 static int qla4xxx_is_intr_poll_mode(struct scsi_qla_host *ha)
53
52
 {
..
..
@@ -625,9 +624,9 @@
625
624
 	uint32_t mbox_sts[MBOX_REG_COUNT];
626
625
 	int status = QLA_ERROR;
627
626
 
628
-	init_fw_cb = dma_zalloc_coherent(&ha->pdev->dev,
629
-					 sizeof(struct addr_ctrl_blk),
630
-					 &init_fw_cb_dma, GFP_KERNEL);
627
+	init_fw_cb = dma_alloc_coherent(&ha->pdev->dev,
628
+					sizeof(struct addr_ctrl_blk),
629
+					&init_fw_cb_dma, GFP_KERNEL);
631
630
 	if (init_fw_cb == NULL) {
632
631
 		DEBUG2(printk("scsi%ld: %s: Unable to alloc init_cb\n",
633
632
 			      ha->host_no, __func__));
..
..
@@ -706,9 +705,9 @@
706
705
 	uint32_t mbox_cmd[MBOX_REG_COUNT];
707
706
 	uint32_t mbox_sts[MBOX_REG_COUNT];
708
707
 
709
-	init_fw_cb = dma_zalloc_coherent(&ha->pdev->dev,
710
-					 sizeof(struct addr_ctrl_blk),
711
-					 &init_fw_cb_dma, GFP_KERNEL);
708
+	init_fw_cb = dma_alloc_coherent(&ha->pdev->dev,
709
+					sizeof(struct addr_ctrl_blk),
710
+					&init_fw_cb_dma, GFP_KERNEL);
712
711
 	if (init_fw_cb == NULL) {
713
712
 		printk("scsi%ld: %s: Unable to alloc init_cb\n", ha->host_no,
714
713
 		       __func__);
..
..
@@ -810,7 +809,7 @@
810
809
 	return QLA_SUCCESS;
811
810
 }
812
811
 
813
-/**
812
+/*
814
813
  * qla4xxx_get_fwddb_entry - retrieves firmware ddb entry
815
814
  * @ha: Pointer to host adapter structure.
816
815
  * @fw_ddb_index: Firmware's device database index
..
..
@@ -1259,8 +1258,7 @@
1259
1258
 /**
1260
1259
  * qla4xxx_reset_target - issues target Reset
1261
1260
  * @ha: Pointer to host adapter structure.
1262
- * @db_entry: Pointer to device database entry
1263
- * @un_entry: Pointer to lun entry structure
1261
+ * @ddb_entry: Pointer to device database entry
1264
1262
  *
1265
1263
  * This routine performs a TARGET RESET on the specified target.
1266
1264
  * The caller must ensure that the ddb_entry pointers
..
..
@@ -1337,9 +1335,9 @@
1337
1335
 	uint32_t mbox_sts[MBOX_REG_COUNT];
1338
1336
 	int status = QLA_ERROR;
1339
1337
 
1340
-	about_fw = dma_zalloc_coherent(&ha->pdev->dev,
1341
-				       sizeof(struct about_fw_info),
1342
-				       &about_fw_dma, GFP_KERNEL);
1338
+	about_fw = dma_alloc_coherent(&ha->pdev->dev,
1339
+				      sizeof(struct about_fw_info),
1340
+				      &about_fw_dma, GFP_KERNEL);
1343
1341
 	if (!about_fw) {
1344
1342
 		DEBUG2(ql4_printk(KERN_ERR, ha, "%s: Unable to alloc memory "
1345
1343
 				  "for about_fw\n", __func__));