iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: mpt3sas: Fix indentation

Browse Source 
Modify the indentation such that smatch no longer complains about
inconsistent indenting.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Sathya Prakash <sathya.prakash@broadcom.com>
Cc: Chaitra P B <chaitra.basappa@broadcom.com>
Cc: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Bart Van Assche 2018-06-15 14:41:54 -07:00 committed by Martin K. Petersen
parent 2fa4a32613
commit 199fd79a11
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/mpt3sas/mpt3sas_base.c
View File

@ -661,7 +661,7 @@ mpt3sas_base_start_watchdog(struct MPT3SAS_ADAPTER *ioc)
if (!ioc->fault_reset_work_q) { if (!ioc->fault_reset_work_q) {
pr_err(MPT3SAS_FMT "%s: failed (line=%d)\n", pr_err(MPT3SAS_FMT "%s: failed (line=%d)\n",
ioc->name, __func__, __LINE__); ioc->name, __func__, __LINE__);
return; return;
} }
spin_lock_irqsave(&ioc->ioc_reset_in_progress_lock, flags); spin_lock_irqsave(&ioc->ioc_reset_in_progress_lock, flags);
if (ioc->fault_reset_work_q) if (ioc->fault_reset_work_q)

40
drivers/scsi/mpt3sas/mpt3sas_scsih.c
View File

@ -2256,7 +2256,7 @@ scsih_slave_configure(struct scsi_device *sdev)
ds = "SSP"; ds = "SSP";
} else { } else {
qdepth = MPT3SAS_SATA_QUEUE_DEPTH; qdepth = MPT3SAS_SATA_QUEUE_DEPTH;
if (raid_device->device_info & if (raid_device->device_info &
MPI2_SAS_DEVICE_INFO_SATA_DEVICE) MPI2_SAS_DEVICE_INFO_SATA_DEVICE)
ds = "SATA"; ds = "SATA";
else else
@ -4003,19 +4003,19 @@ _scsih_issue_delayed_event_ack(struct MPT3SAS_ADAPTER *ioc, u16 smid, U16 event,
static void static void
_scsih_issue_delayed_sas_io_unit_ctrl(struct MPT3SAS_ADAPTER *ioc, _scsih_issue_delayed_sas_io_unit_ctrl(struct MPT3SAS_ADAPTER *ioc,
u16 smid, u16 handle) u16 smid, u16 handle)
{ {
Mpi2SasIoUnitControlRequest_t *mpi_request; Mpi2SasIoUnitControlRequest_t *mpi_request;
u32 ioc_state; u32 ioc_state;
int i = smid - ioc->internal_smid; int i = smid - ioc->internal_smid;
unsigned long flags; unsigned long flags;
if (ioc->remove_host) { if (ioc->remove_host) {
dewtprintk(ioc, pr_info(MPT3SAS_FMT dewtprintk(ioc, pr_info(MPT3SAS_FMT
"%s: host has been removed\n", "%s: host has been removed\n",
__func__, ioc->name)); __func__, ioc->name));
return; return;
} else if (ioc->pci_error_recovery) { } else if (ioc->pci_error_recovery) {
dewtprintk(ioc, pr_info(MPT3SAS_FMT dewtprintk(ioc, pr_info(MPT3SAS_FMT
"%s: host in pci error recovery\n", "%s: host in pci error recovery\n",
__func__, ioc->name)); __func__, ioc->name));
return; return;
@ -4673,19 +4673,19 @@ scsih_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *scmd)
} }
/* host recovery or link resets sent via IOCTLs */ if (ioc->shost_recovery || ioc->ioc_link_reset_in_progress) {
if (ioc->shost_recovery || ioc->ioc_link_reset_in_progress) /* host recovery or link resets sent via IOCTLs */
return SCSI_MLQUEUE_HOST_BUSY; return SCSI_MLQUEUE_HOST_BUSY;
} else if (sas_target_priv_data->deleted) {
/* device has been deleted */ /* device has been deleted */
else if (sas_target_priv_data->deleted) {
scmd->result = DID_NO_CONNECT << 16; scmd->result = DID_NO_CONNECT << 16;
scmd->scsi_done(scmd); scmd->scsi_done(scmd);
return 0; return 0;
/* device busy with task management */
} else if (sas_target_priv_data->tm_busy || } else if (sas_target_priv_data->tm_busy ||
sas_device_priv_data->block) sas_device_priv_data->block) {
/* device busy with task management */
return SCSI_MLQUEUE_DEVICE_BUSY; return SCSI_MLQUEUE_DEVICE_BUSY;
}
/* /*
* Bug work around for firmware SATL handling. The loop * Bug work around for firmware SATL handling. The loop
@ -5811,7 +5811,7 @@ _scsih_expander_add(struct MPT3SAS_ADAPTER *ioc, u16 handle)
} }
_scsih_expander_node_add(ioc, sas_expander); _scsih_expander_node_add(ioc, sas_expander);
return 0; return 0;
out_fail: out_fail:
@ -9522,7 +9522,7 @@ _mpt3sas_fw_work(struct MPT3SAS_ADAPTER *ioc, struct fw_event_work *fw_event)
break; break;
case MPT3SAS_PORT_ENABLE_COMPLETE: case MPT3SAS_PORT_ENABLE_COMPLETE:
ioc->start_scan = 0; ioc->start_scan = 0;
if (missing_delay[0] != -1 && missing_delay[1] != -1) if (missing_delay[0] != -1 && missing_delay[1] != -1)
mpt3sas_base_update_missing_delay(ioc, missing_delay[0], mpt3sas_base_update_missing_delay(ioc, missing_delay[0],
missing_delay[1]); missing_delay[1]);
dewtprintk(ioc, pr_info(MPT3SAS_FMT dewtprintk(ioc, pr_info(MPT3SAS_FMT

2
drivers/scsi/mpt3sas/mpt3sas_transport.c
View File

@ -563,7 +563,7 @@ _transport_add_phy_to_an_existing_port(struct MPT3SAS_ADAPTER *ioc,
return; return;
} }
_transport_add_phy(ioc, mpt3sas_port, mpt3sas_phy); _transport_add_phy(ioc, mpt3sas_port, mpt3sas_phy);
return; return;
} }
} }