|
 |
3d7c23 |
From 16f649d15fe967cad88e5ef40fe3d744cbbd99bf Mon Sep 17 00:00:00 2001
|
|
|
3d7c23 |
From: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3d7c23 |
Date: Thu, 1 Aug 2019 15:55:27 -0400
|
|
|
3d7c23 |
Subject: [PATCH 067/124] [scsi] scsi: qla2xxx: Use tabs to indent code
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Message-id: <20190801155618.12650-68-hmadhani@redhat.com>
|
|
|
3d7c23 |
Patchwork-id: 267842
|
|
|
3d7c23 |
O-Subject: [RHEL 7.8 e-stor PATCH 067/118] scsi: qla2xxx: Use tabs to indent code
|
|
|
3d7c23 |
Bugzilla: 1729270
|
|
|
3d7c23 |
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
3d7c23 |
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
3d7c23 |
|
|
|
3d7c23 |
From: Bart Van Assche <bvanassche@acm.org>
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Bugzilla 1729270
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Most but not all code in the qla2xxx driver uses tabs for indentation.
|
|
|
3d7c23 |
Make the qla2xxx code easier to read by using tabs consistently for
|
|
|
3d7c23 |
indentation. This patch improves conformance with the Linux kernel coding
|
|
|
3d7c23 |
style.
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Cc: Himanshu Madhani <hmadhani@marvell.com>
|
|
|
3d7c23 |
Cc: Giridhar Malavali <gmalavali@marvell.com>
|
|
|
3d7c23 |
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
|
|
|
3d7c23 |
Acked-by: Himanshu Madhani <hmadhani@marvell.com>
|
|
|
3d7c23 |
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
|
|
|
3d7c23 |
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
|
3d7c23 |
(cherry picked from commit 2703eaaf4eae64a742fdcf888c8fcf4de567fb7d)
|
|
|
3d7c23 |
Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3d7c23 |
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
|
3d7c23 |
---
|
|
|
3d7c23 |
drivers/scsi/qla2xxx/qla_init.c | 30 +++++++++++++++---------------
|
|
|
3d7c23 |
drivers/scsi/qla2xxx/qla_iocb.c | 12 ++++++------
|
|
|
3d7c23 |
2 files changed, 21 insertions(+), 21 deletions(-)
|
|
|
3d7c23 |
|
|
|
3d7c23 |
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
|
|
|
3d7c23 |
index 5bf6f02ba147..88a77c4b2f13 100644
|
|
|
3d7c23 |
--- a/drivers/scsi/qla2xxx/qla_init.c
|
|
|
3d7c23 |
+++ b/drivers/scsi/qla2xxx/qla_init.c
|
|
|
3d7c23 |
@@ -1620,21 +1620,21 @@ void qla2x00_fcport_event_handler(scsi_qla_host_t *vha, struct event_arg *ea)
|
|
|
3d7c23 |
*/
|
|
|
3d7c23 |
void qla_rscn_replay(fc_port_t *fcport)
|
|
|
3d7c23 |
{
|
|
|
3d7c23 |
- struct event_arg ea;
|
|
|
3d7c23 |
-
|
|
|
3d7c23 |
- switch (fcport->disc_state) {
|
|
|
3d7c23 |
- case DSC_DELETE_PEND:
|
|
|
3d7c23 |
- return;
|
|
|
3d7c23 |
- default:
|
|
|
3d7c23 |
- break;
|
|
|
3d7c23 |
- }
|
|
|
3d7c23 |
-
|
|
|
3d7c23 |
- if (fcport->scan_needed) {
|
|
|
3d7c23 |
- memset(&ea, 0, sizeof(ea));
|
|
|
3d7c23 |
- ea.event = FCME_RSCN;
|
|
|
3d7c23 |
- ea.id = fcport->d_id;
|
|
|
3d7c23 |
- ea.id.b.rsvd_1 = RSCN_PORT_ADDR;
|
|
|
3d7c23 |
- qla2x00_fcport_event_handler(fcport->vha, &ea);
|
|
|
3d7c23 |
+ struct event_arg ea;
|
|
|
3d7c23 |
+
|
|
|
3d7c23 |
+ switch (fcport->disc_state) {
|
|
|
3d7c23 |
+ case DSC_DELETE_PEND:
|
|
|
3d7c23 |
+ return;
|
|
|
3d7c23 |
+ default:
|
|
|
3d7c23 |
+ break;
|
|
|
3d7c23 |
+ }
|
|
|
3d7c23 |
+
|
|
|
3d7c23 |
+ if (fcport->scan_needed) {
|
|
|
3d7c23 |
+ memset(&ea, 0, sizeof(ea));
|
|
|
3d7c23 |
+ ea.event = FCME_RSCN;
|
|
|
3d7c23 |
+ ea.id = fcport->d_id;
|
|
|
3d7c23 |
+ ea.id.b.rsvd_1 = RSCN_PORT_ADDR;
|
|
|
3d7c23 |
+ qla2x00_fcport_event_handler(fcport->vha, &ea);
|
|
|
3d7c23 |
}
|
|
|
3d7c23 |
}
|
|
|
3d7c23 |
|
|
|
3d7c23 |
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
|
|
|
3d7c23 |
index 47558faacb4f..9f7847adfc36 100644
|
|
|
3d7c23 |
--- a/drivers/scsi/qla2xxx/qla_iocb.c
|
|
|
3d7c23 |
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
|
|
|
3d7c23 |
@@ -1544,18 +1544,18 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
|
|
|
3d7c23 |
switch (scsi_get_prot_op(GET_CMD_SP(sp))) {
|
|
|
3d7c23 |
case SCSI_PROT_READ_INSERT:
|
|
|
3d7c23 |
case SCSI_PROT_WRITE_STRIP:
|
|
|
3d7c23 |
- total_bytes = data_bytes;
|
|
|
3d7c23 |
- data_bytes += dif_bytes;
|
|
|
3d7c23 |
- break;
|
|
|
3d7c23 |
+ total_bytes = data_bytes;
|
|
|
3d7c23 |
+ data_bytes += dif_bytes;
|
|
|
3d7c23 |
+ break;
|
|
|
3d7c23 |
|
|
|
3d7c23 |
case SCSI_PROT_READ_STRIP:
|
|
|
3d7c23 |
case SCSI_PROT_WRITE_INSERT:
|
|
|
3d7c23 |
case SCSI_PROT_READ_PASS:
|
|
|
3d7c23 |
case SCSI_PROT_WRITE_PASS:
|
|
|
3d7c23 |
- total_bytes = data_bytes + dif_bytes;
|
|
|
3d7c23 |
- break;
|
|
|
3d7c23 |
+ total_bytes = data_bytes + dif_bytes;
|
|
|
3d7c23 |
+ break;
|
|
|
3d7c23 |
default:
|
|
|
3d7c23 |
- BUG();
|
|
|
3d7c23 |
+ BUG();
|
|
|
3d7c23 |
}
|
|
|
3d7c23 |
|
|
|
3d7c23 |
if (!qla2x00_hba_err_chk_enabled(sp))
|
|
|
3d7c23 |
--
|
|
|
3d7c23 |
2.13.6
|
|
|
3d7c23 |
|