]> err.no Git - linux-2.6/commitdiff
[SCSI] aic94xx: Remove TMF result code munging
authorDarrick J. Wong <djwong@us.ibm.com>
Tue, 30 Jan 2007 07:48:22 +0000 (23:48 -0800)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Sat, 3 Feb 2007 14:16:19 +0000 (08:16 -0600)
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>
drivers/scsi/aic94xx/aic94xx_tmf.c

index fd5269e086a61000af41e06dd13b67cb750eb5fe..9a14a6d9727548039051e3999f0a8817e076cfce 100644 (file)
@@ -566,14 +566,7 @@ static int asd_initiate_ssp_tmf(struct domain_device *dev, u8 *lun,
                res = TMF_RESP_FUNC_ESUPP;
                break;
        default:
-               if (tmf == TMF_QUERY_TASK) {
-                       ASD_DPRINTK("%s: QUERY_SSP_TASK response: 0x%x\n",
-                                   __FUNCTION__, res);
-                       break;
-               }
-               ASD_DPRINTK("%s: converting result 0x%x to TMF_RESP_FUNC_FAILED\n",
-                           __FUNCTION__, res);
-               res = TMF_RESP_FUNC_FAILED;
+               /* Allow TMF response codes to propagate upwards */
                break;
        }
 out_err: