openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SCSI] isci: fix checkpatch errors 

Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
James Bottomley 2011-07-03 14:14:45 -05:00 committed by James Bottomley
parent 5b45b69c05
commit a5ec7f86dc
5 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/isci/phy.c
View File

@ -197,7 +197,7 @@ sci_phy_link_layer_initialization(struct isci_phy *iphy,
llctl = SCU_SAS_LLCTL_GEN_VAL(NO_OUTBOUND_TASK_TIMEOUT, llctl = SCU_SAS_LLCTL_GEN_VAL(NO_OUTBOUND_TASK_TIMEOUT,
(u8)ihost->user_parameters.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: case SCIC_SDS_PARM_GEN3_SPEED:
link_rate = SCU_SAS_LINK_LAYER_CONTROL_MAX_LINK_RATE_GEN3; link_rate = SCU_SAS_LINK_LAYER_CONTROL_MAX_LINK_RATE_GEN3;
break; break;

7
drivers/scsi/isci/probe_roms.c
View File

@ -34,8 +34,9 @@
#include "task.h" #include "task.h"
#include "probe_roms.h" #include "probe_roms.h"
static efi_char16_t isci_efivar_name[] = static efi_char16_t isci_efivar_name[] = {
{'R', 's', 't', 'S', 'c', 'u', 'O'}; 'R', 's', 't', 'S', 'c', 'u', 'O'
};
struct isci_orom *isci_request_oprom(struct pci_dev *pdev) 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; struct isci_oem_hdr *oem_hdr;
u8 *tmp, sum; u8 *tmp, sum;
int j; int j;
ssize_t data_len; unsigned long data_len;
u8 *efi_data; u8 *efi_data;
u32 efi_attrib = 0; u32 efi_attrib = 0;

2
drivers/scsi/isci/remote_device.c
View File

@ -73,7 +73,7 @@
static void isci_remote_device_not_ready(struct isci_host *ihost, static void isci_remote_device_not_ready(struct isci_host *ihost,
struct isci_remote_device *idev, u32 reason) struct isci_remote_device *idev, u32 reason)
{ {
struct isci_request * ireq; struct isci_request *ireq;
dev_dbg(&ihost->pdev->dev, dev_dbg(&ihost->pdev->dev,
"%s: isci_device = %p\n", __func__, idev); "%s: isci_device = %p\n", __func__, idev);

9
drivers/scsi/isci/task.c
View File

@ -101,7 +101,8 @@ static void isci_task_refuse(struct isci_host *ihost, struct sas_task *task,
break; break;
case isci_perform_aborted_io_completion: case isci_perform_aborted_io_completion:
/* No notification because this request is already in the /*
* No notification because this request is already in the
* abort path. * abort path.
*/ */
dev_dbg(&ihost->pdev->dev, dev_dbg(&ihost->pdev->dev,
@ -1056,7 +1057,7 @@ int isci_task_abort_task(struct sas_task *task)
dev_dbg(&isci_host->pdev->dev, dev_dbg(&isci_host->pdev->dev,
"%s: old_request == %p\n", __func__, old_request); "%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); spin_lock_irqsave(&task->task_state_lock, flags);
@ -1115,9 +1116,9 @@ int isci_task_abort_task(struct sas_task *task)
__func__, task); __func__, task);
} }
goto out; goto out;
} } else {
else
spin_unlock_irqrestore(&task->task_state_lock, flags); spin_unlock_irqrestore(&task->task_state_lock, flags);
}
spin_lock_irqsave(&isci_host->scic_lock, flags); spin_lock_irqsave(&isci_host->scic_lock, flags);