mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/scsi/qla4xxx/ql4_nx.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
 #include <linux/delay.h>
8
7
 #include <linux/io.h>
..
..
@@ -974,10 +973,10 @@
974
973
 	return ret;
975
974
 }
976
975
 
977
-/**
976
+/*
978
977
  * This routine does CRB initialize sequence
979
978
  * to put the ISP into operational state
980
- **/
979
+ */
981
980
 static int
982
981
 qla4_82xx_pinit_from_rom(struct scsi_qla_host *ha, int verbose)
983
982
 {
..
..
@@ -2645,7 +2644,7 @@
2645
2644
 	uint32_t addr1, addr2, value, data, temp, wrval;
2646
2645
 	uint8_t stride, stride2;
2647
2646
 	uint16_t count;
2648
-	uint32_t poll, mask, data_size, modify_mask;
2647
+	uint32_t poll, mask, modify_mask;
2649
2648
 	uint32_t wait_count = 0;
2650
2649
 	uint32_t *data_ptr = *d_ptr;
2651
2650
 	struct qla8044_minidump_entry_rddfe *rddfe;
..
..
@@ -2661,7 +2660,6 @@
2661
2660
 	poll = le32_to_cpu(rddfe->poll);
2662
2661
 	mask = le32_to_cpu(rddfe->mask);
2663
2662
 	modify_mask = le32_to_cpu(rddfe->modify_mask);
2664
-	data_size = le32_to_cpu(rddfe->data_size);
2665
2663
 
2666
2664
 	addr2 = addr1 + stride;
2667
2665
 
..
..
@@ -2742,7 +2740,7 @@
2742
2740
 	uint8_t stride1, stride2;
2743
2741
 	uint32_t addr3, addr4, addr5, addr6, addr7;
2744
2742
 	uint16_t count, loop_cnt;
2745
-	uint32_t poll, mask;
2743
+	uint32_t mask;
2746
2744
 	uint32_t *data_ptr = *d_ptr;
2747
2745
 	struct qla8044_minidump_entry_rdmdio *rdmdio;
2748
2746
 
..
..
@@ -2754,7 +2752,6 @@
2754
2752
 	stride2 = le32_to_cpu(rdmdio->stride_2);
2755
2753
 	count = le32_to_cpu(rdmdio->count);
2756
2754
 
2757
-	poll = le32_to_cpu(rdmdio->poll);
2758
2755
 	mask = le32_to_cpu(rdmdio->mask);
2759
2756
 	value2 = le32_to_cpu(rdmdio->value_2);
2760
2757
 
..
..
@@ -2813,7 +2810,7 @@
2813
2810
 				struct qla8xxx_minidump_entry_hdr *entry_hdr,
2814
2811
 				uint32_t **d_ptr)
2815
2812
 {
2816
-	uint32_t addr1, addr2, value1, value2, poll, mask, r_value;
2813
+	uint32_t addr1, addr2, value1, value2, poll, r_value;
2817
2814
 	struct qla8044_minidump_entry_pollwr *pollwr_hdr;
2818
2815
 	uint32_t wait_count = 0;
2819
2816
 	uint32_t rval = QLA_SUCCESS;
..
..
@@ -2825,7 +2822,6 @@
2825
2822
 	value2 = le32_to_cpu(pollwr_hdr->value_2);
2826
2823
 
2827
2824
 	poll = le32_to_cpu(pollwr_hdr->poll);
2828
-	mask = le32_to_cpu(pollwr_hdr->mask);
2829
2825
 
2830
2826
 	while (wait_count < poll) {
2831
2827
 		ha->isp_ops->rd_reg_indirect(ha, addr1, &r_value);
..
..
@@ -3220,6 +3216,7 @@
3220
3216
 /**
3221
3217
  * qla4_8xxx_uevent_emit - Send uevent when the firmware dump is ready.
3222
3218
  * @ha: pointer to adapter structure
3219
+ * @code: uevent code to act upon
3223
3220
  **/
3224
3221
 static void qla4_8xxx_uevent_emit(struct scsi_qla_host *ha, u32 code)
3225
3222
 {
..
..
@@ -3228,7 +3225,7 @@
3228
3225
 
3229
3226
 	switch (code) {
3230
3227
 	case QL4_UEVENT_CODE_FW_DUMP:
3231
-		snprintf(event_string, sizeof(event_string), "FW_DUMP=%ld",
3228
+		snprintf(event_string, sizeof(event_string), "FW_DUMP=%lu",
3232
3229
 			 ha->host_no);
3233
3230
 		break;
3234
3231
 	default:
..
..
@@ -3688,9 +3685,9 @@
3688
3685
 	return dwptr;
3689
3686
 }
3690
3687
 
3691
-/**
3688
+/*
3692
3689
  * Address and length are byte address
3693
- **/
3690
+ */
3694
3691
 static uint8_t *
3695
3692
 qla4_82xx_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
3696
3693
 		uint32_t offset, uint32_t length)
..
..
@@ -4052,8 +4049,8 @@
4052
4049
 	dma_addr_t sys_info_dma;
4053
4050
 	int status = QLA_ERROR;
4054
4051
 
4055
-	sys_info = dma_zalloc_coherent(&ha->pdev->dev, sizeof(*sys_info),
4056
-				       &sys_info_dma, GFP_KERNEL);
4052
+	sys_info = dma_alloc_coherent(&ha->pdev->dev, sizeof(*sys_info),
4053
+				      &sys_info_dma, GFP_KERNEL);
4057
4054
 	if (sys_info == NULL) {
4058
4055
 		DEBUG2(printk("scsi%ld: %s: Unable to allocate dma buffer.\n",
4059
4056
 		    ha->host_no, __func__));