From 4cbfdcc1b8f035ea5884be915b0d7d4f3e2bd721 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 25 Mar 2008 09:26:52 +0900
Subject: [PATCH] --- yaml --- r: 89701 b: refs/heads/master c:
 11002fbcb472cf1176d97eac214df98f7c17f69c h: refs/heads/master i:   89699:
 1ae6ab6d43532ba7c4dd3d1c84531f9c9f8340ed v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/scsi/stex.c | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 64b3ee21adc9..cdfe2d879061 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 526917641aa50eb852591cc3953a92374bedc836
+refs/heads/master: 11002fbcb472cf1176d97eac214df98f7c17f69c
diff --git a/trunk/drivers/scsi/stex.c b/trunk/drivers/scsi/stex.c
index 8c7b1830d9e8..f308a0308829 100644
--- a/trunk/drivers/scsi/stex.c
+++ b/trunk/drivers/scsi/stex.c
@@ -33,6 +33,7 @@
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_tcq.h>
 #include <scsi/scsi_dbg.h>
+#include <scsi/scsi_eh.h>
 
 #define DRV_NAME "stex"
 #define ST_DRIVER_VERSION "3.6.0000.1"
@@ -362,22 +363,14 @@ static struct status_msg *stex_get_status(struct st_hba *hba)
 	return status;
 }
 
-static void stex_set_sense(struct scsi_cmnd *cmd, u8 sk, u8 asc, u8 ascq)
-{
-	cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;
-
-	cmd->sense_buffer[0] = 0x70;    /* fixed format, current */
-	cmd->sense_buffer[2] = sk;
-	cmd->sense_buffer[7] = 18 - 8;  /* additional sense length */
-	cmd->sense_buffer[12] = asc;
-	cmd->sense_buffer[13] = ascq;
-}
-
 static void stex_invalid_field(struct scsi_cmnd *cmd,
 			       void (*done)(struct scsi_cmnd *))
 {
+	cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;
+
 	/* "Invalid field in cbd" */
-	stex_set_sense(cmd, ILLEGAL_REQUEST, 0x24, 0x0);
+	scsi_build_sense_buffer(0, cmd->sense_buffer, ILLEGAL_REQUEST, 0x24,
+				0x0);
 	done(cmd);
 }