From 3749cf34271326599fe8c209acdde793dfa8535e Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 28 Mar 2021 16:55:40 +0000
Subject: [PATCH] qla2x00t-32gbit: Minimize diffs with upstream

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9372 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla2x00t-32gbit/qla_bsg.c | 99 +++++++++++++--------------------------
 1 file changed, 33 insertions(+), 66 deletions(-)

diff --git a/qla2x00t-32gbit/qla_bsg.c b/qla2x00t-32gbit/qla_bsg.c
index 9cc1c5a85..b37851583 100644
--- a/qla2x00t-32gbit/qla_bsg.c
+++ b/qla2x00t-32gbit/qla_bsg.c
@@ -152,11 +152,10 @@ qla24xx_fcp_prio_cfg_valid(scsi_qla_host_t *vha,
 	return ret;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla24xx_proc_fcp_prio_cfg_cmd(struct bsg_job *bsg_job)
 #endif
 {
@@ -285,11 +284,10 @@ exit_fcp_prio_cfg:
 	return ret;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_process_els(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_process_els(struct bsg_job *bsg_job)
 #endif
 {
@@ -473,11 +471,10 @@ qla24xx_calc_ct_iocbs(uint16_t dsds)
 	return iocbs;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_process_ct(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_process_ct(struct bsg_job *bsg_job)
 #endif
 {
@@ -756,11 +753,10 @@ done_set_internal:
 	return rval;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_process_loopback(struct bsg_job *bsg_job)
 #endif
 {
@@ -1004,11 +1000,10 @@ done_unmap_req_sg:
 	return rval;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla84xx_reset(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla84xx_reset(struct bsg_job *bsg_job)
 #endif
 {
@@ -1045,11 +1040,10 @@ qla84xx_reset(struct bsg_job *bsg_job)
 	return rval;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla84xx_updatefw(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla84xx_updatefw(struct bsg_job *bsg_job)
 #endif
 {
@@ -1160,11 +1154,10 @@ done_unmap_sg:
 	return rval;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla84xx_mgmt_cmd(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla84xx_mgmt_cmd(struct bsg_job *bsg_job)
 #endif
 {
@@ -1361,11 +1354,10 @@ exit_mgmt:
 	return rval;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla24xx_iidma(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla24xx_iidma(struct bsg_job *bsg_job)
 #endif
 {
@@ -1455,12 +1447,11 @@ qla24xx_iidma(struct bsg_job *bsg_job)
 	return rval;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_optrom_setup(struct fc_bsg_job *bsg_job, scsi_qla_host_t *vha,
 	uint8_t is_update)
 #else
-static int
 qla2x00_optrom_setup(struct bsg_job *bsg_job, scsi_qla_host_t *vha,
 	uint8_t is_update)
 #endif
@@ -1531,11 +1522,10 @@ qla2x00_optrom_setup(struct bsg_job *bsg_job, scsi_qla_host_t *vha,
 	return 0;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_read_optrom(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_read_optrom(struct bsg_job *bsg_job)
 #endif
 {
@@ -1573,11 +1563,10 @@ qla2x00_read_optrom(struct bsg_job *bsg_job)
 	return rval;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_update_optrom(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_update_optrom(struct bsg_job *bsg_job)
 #endif
 {
@@ -1619,11 +1608,10 @@ qla2x00_update_optrom(struct bsg_job *bsg_job)
 	return rval;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_update_fru_versions(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_update_fru_versions(struct bsg_job *bsg_job)
 #endif
 {
@@ -1677,11 +1665,10 @@ done:
 	return 0;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_read_fru_status(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_read_fru_status(struct bsg_job *bsg_job)
 #endif
 {
@@ -1733,11 +1720,10 @@ done:
 	return 0;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_write_fru_status(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_write_fru_status(struct bsg_job *bsg_job)
 #endif
 {
@@ -1785,11 +1771,10 @@ done:
 	return 0;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_write_i2c(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_write_i2c(struct bsg_job *bsg_job)
 #endif
 {
@@ -1836,11 +1821,10 @@ done:
 	return 0;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_read_i2c(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_read_i2c(struct bsg_job *bsg_job)
 #endif
 {
@@ -1891,11 +1875,10 @@ done:
 	return 0;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla24xx_process_bidir_cmd(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla24xx_process_bidir_cmd(struct bsg_job *bsg_job)
 #endif
 {
@@ -2074,11 +2057,10 @@ done:
 	return 0;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qlafx00_mgmt_cmd(struct fc_bsg_job *bsg_job)
 #else
-static int
 qlafx00_mgmt_cmd(struct bsg_job *bsg_job)
 #endif
 {
@@ -2202,11 +2184,10 @@ done:
 	return rval;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla26xx_serdes_op(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla26xx_serdes_op(struct bsg_job *bsg_job)
 #endif
 {
@@ -2249,11 +2230,10 @@ qla26xx_serdes_op(struct bsg_job *bsg_job)
 	return 0;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla8044_serdes_op(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla8044_serdes_op(struct bsg_job *bsg_job)
 #endif
 {
@@ -2296,11 +2276,10 @@ qla8044_serdes_op(struct bsg_job *bsg_job)
 	return 0;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla27xx_get_flash_upd_cap(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla27xx_get_flash_upd_cap(struct bsg_job *bsg_job)
 #endif
 {
@@ -2333,11 +2312,10 @@ qla27xx_get_flash_upd_cap(struct bsg_job *bsg_job)
 	return 0;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla27xx_set_flash_upd_cap(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla27xx_set_flash_upd_cap(struct bsg_job *bsg_job)
 #endif
 {
@@ -2384,11 +2362,10 @@ qla27xx_set_flash_upd_cap(struct bsg_job *bsg_job)
 	return 0;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla27xx_get_bbcr_data(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla27xx_get_bbcr_data(struct bsg_job *bsg_job)
 #endif
 {
@@ -2448,11 +2425,10 @@ done:
 	return 0;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_get_priv_stats(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_get_priv_stats(struct bsg_job *bsg_job)
 #endif
 {
@@ -2512,11 +2488,10 @@ qla2x00_get_priv_stats(struct bsg_job *bsg_job)
 	return 0;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_do_dport_diagnostics(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_do_dport_diagnostics(struct bsg_job *bsg_job)
 #endif
 {
@@ -2561,11 +2536,10 @@ qla2x00_do_dport_diagnostics(struct bsg_job *bsg_job)
 	return 0;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_get_flash_image_status(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_get_flash_image_status(struct bsg_job *bsg_job)
 #endif
 {
@@ -2605,11 +2579,10 @@ qla2x00_get_flash_image_status(struct bsg_job *bsg_job)
 	return 0;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_manage_host_stats(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_manage_host_stats(struct bsg_job *bsg_job)
 #endif
 {
@@ -2679,11 +2652,10 @@ qla2x00_manage_host_stats(struct bsg_job *bsg_job)
 	return ret;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_get_host_stats(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_get_host_stats(struct bsg_job *bsg_job)
 #endif
 {
@@ -2785,11 +2757,10 @@ qla2xxx_find_rport(scsi_qla_host_t *vha, uint32_t tgt_num)
 	return NULL;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_get_tgt_stats(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_get_tgt_stats(struct bsg_job *bsg_job)
 #endif
 {
@@ -2879,11 +2850,10 @@ tgt_stat_out:
 	return ret;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_manage_host_port(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_manage_host_port(struct bsg_job *bsg_job)
 #endif
 {
@@ -2942,11 +2912,10 @@ qla2x00_manage_host_port(struct bsg_job *bsg_job)
 	return ret;
 }
 
-#ifndef NEW_LIBFC_API
 static int
+#ifndef NEW_LIBFC_API
 qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job)
 #else
-static int
 qla2x00_process_vendor_specific(struct bsg_job *bsg_job)
 #endif
 {
@@ -3040,11 +3009,10 @@ qla2x00_process_vendor_specific(struct bsg_job *bsg_job)
 	}
 }
 
-#ifndef NEW_LIBFC_API
 int
+#ifndef NEW_LIBFC_API
 qla24xx_bsg_request(struct fc_bsg_job *bsg_job)
 #else
-int
 qla24xx_bsg_request(struct bsg_job *bsg_job)
 #endif
 {
@@ -3110,11 +3078,10 @@ skip_chip_chk:
 	return ret;
 }
 
-#ifndef NEW_LIBFC_API
 int
+#ifndef NEW_LIBFC_API
 qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job)
 #else
-int
 qla24xx_bsg_timeout(struct bsg_job *bsg_job)
 #endif
 {