[SCSI] isci: fix checkpatch errors

Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/isci/phy.c b/drivers/scsi/isci/phy.c
index d8f893ee7d035488745eff5025e98c22af9a7bf8..79313a7a2356ac2e85c9f80ec4d1f6e54d28fb00 100644 (file)
--- a/drivers/scsi/isci/phy.c
+++ b/drivers/scsi/isci/phy.c
@@ -197,7 +197,7 @@ sci_phy_link_layer_initialization(struct isci_phy *iphy,
        llctl = SCU_SAS_LLCTL_GEN_VAL(NO_OUTBOUND_TASK_TIMEOUT,
                (u8)ihost->user_parameters.no_outbound_task_timeout);
 
-       switch(phy_user->max_speed_generation) {
+       switch (phy_user->max_speed_generation) {
        case SCIC_SDS_PARM_GEN3_SPEED:
                link_rate = SCU_SAS_LINK_LAYER_CONTROL_MAX_LINK_RATE_GEN3;
                break;

diff --git a/drivers/scsi/isci/probe_roms.c b/drivers/scsi/isci/probe_roms.c
index 4b9d813c63b139d8930bb25e46607a970715bf15..b5f4341de2434ead30763b4228e49ff5ee2edc67 100644 (file)
--- a/drivers/scsi/isci/probe_roms.c
+++ b/drivers/scsi/isci/probe_roms.c
@@ -34,8 +34,9 @@
 #include "task.h"
 #include "probe_roms.h"
 
-static efi_char16_t isci_efivar_name[] =
-                       {'R', 's', 't', 'S', 'c', 'u', 'O'};
+static efi_char16_t isci_efivar_name[] = {
+       'R', 's', 't', 'S', 'c', 'u', 'O'
+};
 
 struct isci_orom *isci_request_oprom(struct pci_dev *pdev)
 {
@@ -182,7 +183,7 @@ struct isci_orom *isci_get_efi_var(struct pci_dev *pdev)
        struct isci_oem_hdr *oem_hdr;
        u8 *tmp, sum;
        int j;
-       ssize_t data_len;
+       unsigned long data_len;
        u8 *efi_data;
        u32 efi_attrib = 0;
 

diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c
index 85e54f5420754d4be630209d66157a4f74042f2d..b6e6368c2665e610bd8efdd7abf5b299bedf7e7e 100644 (file)
--- a/drivers/scsi/isci/remote_device.c
+++ b/drivers/scsi/isci/remote_device.c
@@ -73,7 +73,7 @@
 static void isci_remote_device_not_ready(struct isci_host *ihost,
                                  struct isci_remote_device *idev, u32 reason)
 {
-       struct isci_request * ireq;
+       struct isci_request *ireq;
 
        dev_dbg(&ihost->pdev->dev,
                "%s: isci_device = %p\n", __func__, idev);

diff --git a/drivers/scsi/isci/request.h b/drivers/scsi/isci/request.h
index 11bc279457aa1a49c653b1c5c8c5798505d1dd48..7a1d5a9778eba04c557ae68fe7a20147d4debd6a 100644 (file)
--- a/drivers/scsi/isci/request.h
+++ b/drivers/scsi/isci/request.h
@@ -440,8 +440,8 @@ void sci_smp_request_copy_response(struct isci_request *ireq);
 static inline int isci_task_is_ncq_recovery(struct sas_task *task)
 {
        return (sas_protocol_ata(task->task_proto) &&
-               task->ata_task.fis.command == ATA_CMD_READ_LOG_EXT &&
-               task->ata_task.fis.lbal == ATA_LOG_SATA_NCQ);
+               task->ata_task.fis.command == ATA_CMD_READ_LOG_EXT &&
+               task->ata_task.fis.lbal == ATA_LOG_SATA_NCQ);
 
 }
 

diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
index 2df45c57fc608b48f3aedf66e1ce7bc7dfa05223..d6bcdd013dc9f4231f3f7fa0034e0f2a343282d7 100644 (file)
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -88,44 +88,45 @@ static void isci_task_refuse(struct isci_host *ihost, struct sas_task *task,
         * function should not be completed to the host in the regular path.
         */
        switch (disposition) {
-               case isci_perform_normal_io_completion:
-                       /* Normal notification (task_done) */
-                       dev_dbg(&ihost->pdev->dev,
-                               "%s: Normal - task = %p, response=%d, "
-                               "status=%d\n",
-                               __func__, task, response, status);
+       case isci_perform_normal_io_completion:
+               /* Normal notification (task_done) */
+               dev_dbg(&ihost->pdev->dev,
+                       "%s: Normal - task = %p, response=%d, "
+                       "status=%d\n",
+                       __func__, task, response, status);
 
-                       task->lldd_task = NULL;
+               task->lldd_task = NULL;
 
-                       isci_execpath_callback(ihost, task, task->task_done);
-                       break;
+               isci_execpath_callback(ihost, task, task->task_done);
+               break;
 
-               case isci_perform_aborted_io_completion:
-                       /* No notification because this request is already in the
-                       * abort path.
-                       */
-                       dev_dbg(&ihost->pdev->dev,
-                                "%s: Aborted - task = %p, response=%d, "
-                               "status=%d\n",
-                                __func__, task, response, status);
-                       break;
+       case isci_perform_aborted_io_completion:
+               /*
+                * No notification because this request is already in the
+                * abort path.
+                */
+               dev_dbg(&ihost->pdev->dev,
+                       "%s: Aborted - task = %p, response=%d, "
+                       "status=%d\n",
+                       __func__, task, response, status);
+               break;
 
-               case isci_perform_error_io_completion:
-                       /* Use sas_task_abort */
-                       dev_dbg(&ihost->pdev->dev,
-                                "%s: Error - task = %p, response=%d, "
-                               "status=%d\n",
-                                __func__, task, response, status);
+       case isci_perform_error_io_completion:
+               /* Use sas_task_abort */
+               dev_dbg(&ihost->pdev->dev,
+                       "%s: Error - task = %p, response=%d, "
+                       "status=%d\n",
+                       __func__, task, response, status);
 
-                       isci_execpath_callback(ihost, task, sas_task_abort);
-                       break;
+               isci_execpath_callback(ihost, task, sas_task_abort);
+               break;
 
-               default:
-                       dev_dbg(&ihost->pdev->dev,
-                                "%s: isci task notification default case!",
-                                __func__);
-                       sas_task_abort(task);
-                       break;
+       default:
+               dev_dbg(&ihost->pdev->dev,
+                       "%s: isci task notification default case!",
+                       __func__);
+               sas_task_abort(task);
+               break;
        }
 }
 
@@ -1056,7 +1057,7 @@ int isci_task_abort_task(struct sas_task *task)
        dev_dbg(&isci_host->pdev->dev,
                "%s: old_request == %p\n", __func__, old_request);
 
-       any_dev_reset = isci_device_is_reset_pending(isci_host,isci_device);
+       any_dev_reset = isci_device_is_reset_pending(isci_host, isci_device);
 
        spin_lock_irqsave(&task->task_state_lock, flags);
 
@@ -1115,9 +1116,9 @@ int isci_task_abort_task(struct sas_task *task)
                                __func__, task);
                }
                goto out;
-       }
-       else
+       } else {
                spin_unlock_irqrestore(&task->task_state_lock, flags);
+       }
 
        spin_lock_irqsave(&isci_host->scic_lock, flags);