From 9e22c451aa30b17c492dc529a40f1a397174e166 Mon Sep 17 00:00:00 2001 From: Mike Miller Date: Fri, 16 Apr 2010 13:28:41 -0500 Subject: [PATCH] --- yaml --- r: 195661 b: refs/heads/master c: 859e816704b4139d15b1ec6a3505f12faef5333a h: refs/heads/master i: 195659: fa725b918647aac48b7cb916dcbc770292dfe97d v: v3 --- [refs] | 2 +- trunk/drivers/scsi/hpsa.c | 8 -------- trunk/drivers/scsi/hpsa_cmd.h | 15 --------------- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/[refs] b/[refs] index f493e2e90b89..d027d9c62cd5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 160e7f671344e40b86663a8913e175a3bb5d7f84 +refs/heads/master: 859e816704b4139d15b1ec6a3505f12faef5333a diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c index 183d3a43c280..c016426b31b2 100644 --- a/trunk/drivers/scsi/hpsa.c +++ b/trunk/drivers/scsi/hpsa.c @@ -2708,14 +2708,6 @@ static void fill_cmd(struct CommandList *c, u8 cmd, struct ctlr_info *h, c->Request.CDB[8] = (size >> 8) & 0xFF; c->Request.CDB[9] = size & 0xFF; break; - - case HPSA_READ_CAPACITY: - c->Request.CDBLen = 10; - c->Request.Type.Attribute = ATTR_SIMPLE; - c->Request.Type.Direction = XFER_READ; - c->Request.Timeout = 0; - c->Request.CDB[0] = cmd; - break; case HPSA_CACHE_FLUSH: c->Request.CDBLen = 12; c->Request.Type.Attribute = ATTR_SIMPLE; diff --git a/trunk/drivers/scsi/hpsa_cmd.h b/trunk/drivers/scsi/hpsa_cmd.h index 56fb9827681e..78de9b6d1e0b 100644 --- a/trunk/drivers/scsi/hpsa_cmd.h +++ b/trunk/drivers/scsi/hpsa_cmd.h @@ -152,21 +152,6 @@ struct SenseSubsystem_info { u8 reserved1[1108]; }; -#define HPSA_READ_CAPACITY 0x25 /* Read Capacity */ -struct ReadCapdata { - u8 total_size[4]; /* Total size in blocks */ - u8 block_size[4]; /* Size of blocks in bytes */ -}; - -#if 0 -/* 12 byte commands not implemented in firmware yet. */ -#define HPSA_READ 0xa8 -#define HPSA_WRITE 0xaa -#endif - -#define HPSA_READ 0x28 /* Read(10) */ -#define HPSA_WRITE 0x2a /* Write(10) */ - /* BMIC commands */ #define BMIC_READ 0x26 #define BMIC_WRITE 0x27