From: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Date: Fri, 21 Feb 2014 22:25:10 +0000 (-0600)
Subject: [SCSI] hpsa: remove unused struct request from CommandList
X-Git-Tag: firefly_0821_release~176^2~4190^2~39
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c14c5891ddbd20cffbc4e35bfba8b7fbac9d5ada;p=firefly-linux-kernel-4.4.55.git
[SCSI] hpsa: remove unused struct request from CommandList
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
---
diff --git a/drivers/scsi/hpsa_cmd.h b/drivers/scsi/hpsa_cmd.h
index 8026d2e8154d..50388f133ac9 100644
--- a/drivers/scsi/hpsa_cmd.h
+++ b/drivers/scsi/hpsa_cmd.h
@@ -386,7 +386,6 @@ struct CommandList {
int cmd_type;
long cmdindex;
struct list_head list;
- struct request *rq;
struct completion *waiting;
void *scsi_cmd;
@@ -399,8 +398,8 @@ struct CommandList {
*/
#define IS_32_BIT ((8 - sizeof(long))/4)
#define IS_64_BIT (!IS_32_BIT)
-#define PAD_32 (36)
-#define PAD_64 (4)
+#define PAD_32 (40)
+#define PAD_64 (12)
#define COMMANDLIST_PAD (IS_32_BIT * PAD_32 + IS_64_BIT * PAD_64)
u8 pad[COMMANDLIST_PAD];
};