scsi: mpt3sas: Fix indentation

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>

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 8273ed7e7896b854d96b910d06934186135d8a87..5e632bbd8410eee98c4f9ff2b9fa9a0e6d4370c3 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -661,7 +661,7 @@ mpt3sas_base_start_watchdog(struct MPT3SAS_ADAPTER *ioc)
        if (!ioc->fault_reset_work_q) {
                pr_err(MPT3SAS_FMT "%s: failed (line=%d)\n",
                    ioc->name, __func__, __LINE__);
-                       return;
+               return;
        }
        spin_lock_irqsave(&ioc->ioc_reset_in_progress_lock, flags);
        if (ioc->fault_reset_work_q)

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 23902ad3cae57d5a5d971f4580d7c4c755ae3457..f3fcdd4654796ecca39bab6ccf18488e27cad5f2 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -2256,7 +2256,7 @@ scsih_slave_configure(struct scsi_device *sdev)
                        ds = "SSP";
                } else {
                        qdepth = MPT3SAS_SATA_QUEUE_DEPTH;
-                        if (raid_device->device_info &
+                       if (raid_device->device_info &
                            MPI2_SAS_DEVICE_INFO_SATA_DEVICE)
                                ds = "SATA";
                        else
@@ -4003,19 +4003,19 @@ _scsih_issue_delayed_event_ack(struct MPT3SAS_ADAPTER *ioc, u16 smid, U16 event,
 static void
 _scsih_issue_delayed_sas_io_unit_ctrl(struct MPT3SAS_ADAPTER *ioc,
                                        u16 smid, u16 handle)
-       {
-               Mpi2SasIoUnitControlRequest_t *mpi_request;
-               u32 ioc_state;
-               int i = smid - ioc->internal_smid;
-               unsigned long flags;
+{
+       Mpi2SasIoUnitControlRequest_t *mpi_request;
+       u32 ioc_state;
+       int i = smid - ioc->internal_smid;
+       unsigned long flags;
 
-               if (ioc->remove_host) {
-                       dewtprintk(ioc, pr_info(MPT3SAS_FMT
+       if (ioc->remove_host) {
+               dewtprintk(ioc, pr_info(MPT3SAS_FMT
                            "%s: host has been removed\n",
                             __func__, ioc->name));
-                       return;
-               } else if (ioc->pci_error_recovery) {
-                       dewtprintk(ioc, pr_info(MPT3SAS_FMT
+               return;
+       } else if (ioc->pci_error_recovery) {
+               dewtprintk(ioc, pr_info(MPT3SAS_FMT
                            "%s: host in pci error recovery\n",
                            __func__, ioc->name));
                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;
-
-       /* device has been deleted */
-       else if (sas_target_priv_data->deleted) {
+       } else if (sas_target_priv_data->deleted) {
+               /* device has been deleted */
                scmd->result = DID_NO_CONNECT << 16;
                scmd->scsi_done(scmd);
                return 0;
-       /* device busy with task management */
        } 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;
+       }
 
        /*
         * 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);
-        return 0;
+       return 0;
 
  out_fail:
 
@@ -9522,7 +9522,7 @@ _mpt3sas_fw_work(struct MPT3SAS_ADAPTER *ioc, struct fw_event_work *fw_event)
                break;
        case MPT3SAS_PORT_ENABLE_COMPLETE:
                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],
                            missing_delay[1]);
                dewtprintk(ioc, pr_info(MPT3SAS_FMT

diff --git a/drivers/scsi/mpt3sas/mpt3sas_transport.c b/drivers/scsi/mpt3sas/mpt3sas_transport.c
index 3a143bb5ca72582309175f172b747f54c042db5b..05d506d78c66f94779410325a88bc653a392441a 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_transport.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_transport.c
@@ -563,7 +563,7 @@ _transport_add_phy_to_an_existing_port(struct MPT3SAS_ADAPTER *ioc,
                                return;
                }
                _transport_add_phy(ioc, mpt3sas_port, mpt3sas_phy);
-                       return;
+               return;
        }
 
 }