diff options
author | Mark Salyzyn <mark_salyzyn@us.xyratex.com> | 2011-09-26 10:57:36 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2011-10-02 14:05:11 -0400 |
commit | 6fbc769219a7a8060ea33f397304f05b1cdf8a00 (patch) | |
tree | 31751b6a4996e2caaccb96c855b783f9f5a89b28 /drivers/scsi/pm8001/pm8001_sas.c | |
parent | b90b378ad5767c0743113c675b09ac00fa534c33 (diff) |
[SCSI] pm8001: missing break statements
Code Inspection: found two missing break directives. First one will
result in not retrying an a task that report
IO_OPEN_CNX_ERROR_HW_RESOURCE_BUSY, the second will result in cosmetic
debug printk conflicting statement stutter. Because checkpatch.pl came
up with a warning regarding unnecessary space before a newline on one of
the fragments associated with the diff context, I took the liberty of
fixing all the cases of this issue in the pair of files touched by this
defect. These cosmetic changes hide the break changes :-(
To help focus, break changes are in pm8001_hwi.c fragment line 1649 for
the IO_OPEN_CNX_ERROR_HW_RESOURCE_BUSY case statement and pm8001_sas.c
line 1000 deals with the conflicting debug print stutter.
Signed-off-by: Mark Salyzyn <mark_salyzyn@us.xyratex.com>
Acked-by: Jack Wang <jack_wang@usish.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/pm8001/pm8001_sas.c')
-rw-r--r-- | drivers/scsi/pm8001/pm8001_sas.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c index dfda00d43326..5ac90c3d4cc1 100644 --- a/drivers/scsi/pm8001/pm8001_sas.c +++ b/drivers/scsi/pm8001/pm8001_sas.c | |||
@@ -609,7 +609,7 @@ static int pm8001_dev_found_notify(struct domain_device *dev) | |||
609 | flag = 1; /* directly sata*/ | 609 | flag = 1; /* directly sata*/ |
610 | } | 610 | } |
611 | } /*register this device to HBA*/ | 611 | } /*register this device to HBA*/ |
612 | PM8001_DISC_DBG(pm8001_ha, pm8001_printk("Found device \n")); | 612 | PM8001_DISC_DBG(pm8001_ha, pm8001_printk("Found device\n")); |
613 | PM8001_CHIP_DISP->reg_dev_req(pm8001_ha, pm8001_device, flag); | 613 | PM8001_CHIP_DISP->reg_dev_req(pm8001_ha, pm8001_device, flag); |
614 | spin_unlock_irqrestore(&pm8001_ha->lock, flags); | 614 | spin_unlock_irqrestore(&pm8001_ha->lock, flags); |
615 | wait_for_completion(&completion); | 615 | wait_for_completion(&completion); |
@@ -958,13 +958,14 @@ int pm8001_query_task(struct sas_task *task) | |||
958 | /* The task is still in Lun, release it then */ | 958 | /* The task is still in Lun, release it then */ |
959 | case TMF_RESP_FUNC_SUCC: | 959 | case TMF_RESP_FUNC_SUCC: |
960 | PM8001_EH_DBG(pm8001_ha, | 960 | PM8001_EH_DBG(pm8001_ha, |
961 | pm8001_printk("The task is still in Lun \n")); | 961 | pm8001_printk("The task is still in Lun\n")); |
962 | break; | ||
962 | /* The task is not in Lun or failed, reset the phy */ | 963 | /* The task is not in Lun or failed, reset the phy */ |
963 | case TMF_RESP_FUNC_FAILED: | 964 | case TMF_RESP_FUNC_FAILED: |
964 | case TMF_RESP_FUNC_COMPLETE: | 965 | case TMF_RESP_FUNC_COMPLETE: |
965 | PM8001_EH_DBG(pm8001_ha, | 966 | PM8001_EH_DBG(pm8001_ha, |
966 | pm8001_printk("The task is not in Lun or failed," | 967 | pm8001_printk("The task is not in Lun or failed," |
967 | " reset the phy \n")); | 968 | " reset the phy\n")); |
968 | break; | 969 | break; |
969 | } | 970 | } |
970 | } | 971 | } |