diff options
author | Darrick J. Wong <djwong@us.ibm.com> | 2007-01-30 02:48:22 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-03 09:16:19 -0500 |
commit | 058e2c474897dc53c88ac9162f9a9b16a879b8cd (patch) | |
tree | fbfe6f7d6be148f129389d62e255ff96225c81c1 /drivers/scsi/aic94xx | |
parent | a9344e68ac0a656475006737dbc258d69fe4f7b0 (diff) |
[SCSI] aic94xx: Remove TMF result code munging
In asd_initiate_ssp_tmf, the TMF result code is replaced with
TMF_RESP_FUNC_FAILED except when the TMF returns a result code immediately.
However, TMFs can return result codes via an ESCB... yet these codes are
also replaced with "FAILED". The only values that can fall into that case
are TMF_* codes anyway, so get rid of this code where COMPLETE and SUCCESS
are turned into FAILED. This also lets us propagate those TMF_* codes up
to the caller.
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aic94xx')
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_tmf.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_tmf.c b/drivers/scsi/aic94xx/aic94xx_tmf.c index fd5269e086a6..9a14a6d97275 100644 --- a/drivers/scsi/aic94xx/aic94xx_tmf.c +++ b/drivers/scsi/aic94xx/aic94xx_tmf.c | |||
@@ -566,14 +566,7 @@ static int asd_initiate_ssp_tmf(struct domain_device *dev, u8 *lun, | |||
566 | res = TMF_RESP_FUNC_ESUPP; | 566 | res = TMF_RESP_FUNC_ESUPP; |
567 | break; | 567 | break; |
568 | default: | 568 | default: |
569 | if (tmf == TMF_QUERY_TASK) { | 569 | /* Allow TMF response codes to propagate upwards */ |
570 | ASD_DPRINTK("%s: QUERY_SSP_TASK response: 0x%x\n", | ||
571 | __FUNCTION__, res); | ||
572 | break; | ||
573 | } | ||
574 | ASD_DPRINTK("%s: converting result 0x%x to TMF_RESP_FUNC_FAILED\n", | ||
575 | __FUNCTION__, res); | ||
576 | res = TMF_RESP_FUNC_FAILED; | ||
577 | break; | 570 | break; |
578 | } | 571 | } |
579 | out_err: | 572 | out_err: |