From 36f8f9bb164735986c74ef0ca61e06e1fc53fca3 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 4 Nov 2018 04:36:35 +0000
Subject: [PATCH] Merge r7462 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7715 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla2x00t/qla_attr.c      | 20 +++++++++++++++-----
 qla2x00t/qla_isr.c       |  5 +++--
 qla2x00t/qla_nx.c        |  9 +++------
 qla_isp/linux/isp_scst.c |  3 +--
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/qla2x00t/qla_attr.c b/qla2x00t/qla_attr.c
index 68f299aeb..3017df326 100644
--- a/qla2x00t/qla_attr.c
+++ b/qla2x00t/qla_attr.c
@@ -482,11 +482,21 @@ out_id_list_failed:
 			if (size >= max_size)
 				goto out;
 			switch (atomic_read(&fcport->state)) {
-			case FCS_UNCONFIGURED: state = "Unconfigured"; break;
-			case FCS_DEVICE_DEAD: state = "Dead"; break;
-			case FCS_DEVICE_LOST: state = "Lost"; break;
-			case FCS_ONLINE: state = "Online"; break;
-			default: state = "Unknown"; break;
+			case FCS_UNCONFIGURED:
+				state = "Unconfigured";
+				break;
+			case FCS_DEVICE_DEAD:
+				state = "Dead";
+				break;
+			case FCS_DEVICE_LOST:
+				state = "Lost";
+				break;
+			case FCS_ONLINE:
+				state = "Online";
+				break;
+			default:
+				state = "Unknown";
+				break;
 			}
 
 			size += scnprintf(buffer+size, max_size-size,
diff --git a/qla2x00t/qla_isr.c b/qla2x00t/qla_isr.c
index 65f585b3e..070c9287a 100644
--- a/qla2x00t/qla_isr.c
+++ b/qla2x00t/qla_isr.c
@@ -287,8 +287,9 @@ qla2x00_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0)
 static void
 qla81xx_idc_event(scsi_qla_host_t *vha, uint16_t aen, uint16_t descr)
 {
-	static char *event[] =
-		{ "Complete", "Request Notification", "Time Extension" };
+	static char *event[] = {
+		"Complete", "Request Notification", "Time Extension"
+	};
 	int rval;
 	struct device_reg_24xx __iomem *reg24 = &vha->hw->iobase->isp24;
 	uint16_t __iomem *wptr;
diff --git a/qla2x00t/qla_nx.c b/qla2x00t/qla_nx.c
index 19b192fe1..0f49375d5 100644
--- a/qla2x00t/qla_nx.c
+++ b/qla2x00t/qla_nx.c
@@ -264,8 +264,7 @@ static struct crb_128M_2M_block_map crb_128M_2M_map[64] = {
 /*
  * top 12 bits of crb internal address (hub, agent)
  */
-static unsigned qla82xx_crb_hub_agt[64] =
-{
+static unsigned qla82xx_crb_hub_agt[64] = {
 	0,
 	QLA82XX_HW_CRB_HUB_AGT_ADR_PS,
 	QLA82XX_HW_CRB_HUB_AGT_ADR_MN,
@@ -4409,8 +4408,7 @@ qla82xx_beacon_on(struct scsi_qla_host *vha)
 	qla82xx_idc_lock(ha);
 	rval = qla82xx_mbx_beacon_ctl(vha, 1);
 
-	if (rval)
-	{
+	if (rval) {
 		ql_log(ql_log_warn, vha, 0xb050,
 		    "mbx set led config failed in %s\n", __func__);
 		goto exit;
@@ -4430,8 +4428,7 @@ qla82xx_beacon_off(struct scsi_qla_host *vha)
 	qla82xx_idc_lock(ha);
 	rval = qla82xx_mbx_beacon_ctl(vha, 0);
 
-	if (rval)
-	{
+	if (rval) {
 		ql_log(ql_log_warn, vha, 0xb051,
 		    "mbx set led config failed in %s\n", __func__);
 		goto exit;
diff --git a/qla_isp/linux/isp_scst.c b/qla_isp/linux/isp_scst.c
index f9e0c7102..83b99c328 100644
--- a/qla_isp/linux/isp_scst.c
+++ b/qla_isp/linux/isp_scst.c
@@ -1585,8 +1585,7 @@ static uint16_t isp_get_scsi_transport_version(struct scst_tgt *scst_tgt)
 	return 0x0900; /* FCP-2 */
 }
 
-static struct scst_tgt_template isp_tgt_template =
-{
+static struct scst_tgt_template isp_tgt_template = {
     .sg_tablesize = SG_ALL, /* we set this value lately based on hardware */
     .name = "qla_isp",
     .unchecked_isa_dma = 0,