scsi: aacraid: clean up some indentation and formatting issues

There are several issues with badly indented statements. Fix these
and clean up the formatting.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Mahesh Rajashekhara <mahesh.rajashekhara@microchip.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index d5a6aa9676c8f4c3ee77b0ebc438c9b2cad38cd0..0bdc6b0f725f59f7e084fc14d36d242d82ce5a29 100644 (file)
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1376,18 +1376,19 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
 
        container = 0;
 retry_next:
-       if (device_config_needed == NOTHING)
-       for (; container < dev->maximum_num_containers; ++container) {
-               if ((dev->fsa_dev[container].config_waiting_on == 0) &&
-                       (dev->fsa_dev[container].config_needed != NOTHING) &&
-                       time_before(jiffies, dev->fsa_dev[container].config_waiting_stamp + AIF_SNIFF_TIMEOUT)) {
-                       device_config_needed =
-                               dev->fsa_dev[container].config_needed;
-                       dev->fsa_dev[container].config_needed = NOTHING;
-                       channel = CONTAINER_TO_CHANNEL(container);
-                       id = CONTAINER_TO_ID(container);
-                       lun = CONTAINER_TO_LUN(container);
-                       break;
+       if (device_config_needed == NOTHING) {
+               for (; container < dev->maximum_num_containers; ++container) {
+                       if ((dev->fsa_dev[container].config_waiting_on == 0) &&
+                           (dev->fsa_dev[container].config_needed != NOTHING) &&
+                           time_before(jiffies, dev->fsa_dev[container].config_waiting_stamp + AIF_SNIFF_TIMEOUT)) {
+                               device_config_needed =
+                                       dev->fsa_dev[container].config_needed;
+                               dev->fsa_dev[container].config_needed = NOTHING;
+                               channel = CONTAINER_TO_CHANNEL(container);
+                               id = CONTAINER_TO_ID(container);
+                               lun = CONTAINER_TO_LUN(container);
+                               break;
+                       }
                }
        }
        if (device_config_needed == NOTHING)

diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 634ddb90e7aae6010eb3c6f231e68d343d17ab90..dd701d5243b1858e0acec3c0cf2458d0077390ad 100644 (file)
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -852,8 +852,7 @@ static u8 aac_eh_tmf_hard_reset_fib(struct aac_hba_map_info *info,
 
        address = (u64)fib->hw_error_pa;
        rst->error_ptr_hi = cpu_to_le32((u32)(address >> 32));
-       rst->error_ptr_lo = cpu_to_le32
-               ((u32)(address & 0xffffffff));
+       rst->error_ptr_lo = cpu_to_le32((u32)(address & 0xffffffff));
        rst->error_length = cpu_to_le32(FW_ERROR_BUFFER_SIZE);
        fib->hbacmd_size = sizeof(*rst);
 

diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c
index 8377aec0649d098a103ed6802ee206bd3e289cb2..97bb9e9d201c7480e55dbd12da64c5fcb13c9c02 100644 (file)
--- a/drivers/scsi/aacraid/src.c
+++ b/drivers/scsi/aacraid/src.c
@@ -1157,7 +1157,7 @@ static int aac_src_soft_reset(struct aac_dev *dev)
                dev_err(&dev->pdev->dev, "%s: %s status = %d", __func__,
                        state_str[state], rc);
 
-return rc;
+       return rc;
 }
 /**
  *  aac_srcv_init      -       initialize an SRCv card