From: Stephen M. Cameron <StephenM.Cameron>
Date: Thu, 6 Jan 2011 20:47:58 +0000 (-0600)
Subject: [SCSI] hpsa: Remove duplicate defines of DIRECT_LOOKUP_ constants
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=922a9e4da34270d81e216728f929c6e11e169794;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

[SCSI] hpsa: Remove duplicate defines of DIRECT_LOOKUP_ constants

They are defined in hpsa_cmd.h

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
---

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index e2089a3b506..b345cc47694 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -2863,13 +2863,11 @@ static inline void finish_cmd(struct CommandList *c, u32 raw_tag)
 
 static inline u32 hpsa_tag_contains_index(u32 tag)
 {
-#define DIRECT_LOOKUP_BIT 0x10
 	return tag & DIRECT_LOOKUP_BIT;
 }
 
 static inline u32 hpsa_tag_to_index(u32 tag)
 {
-#define DIRECT_LOOKUP_SHIFT 5
 	return tag >> DIRECT_LOOKUP_SHIFT;
 }