aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/bfa
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2010-08-10 21:01:26 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 11:59:01 -0400
commita737b88df8d0b4476ae53daaa6db137df0541203 (patch)
tree98b0a1810cda0a8a130b4ec117c71318c0f86107 /drivers/scsi/bfa
parent5c90ad905b401c6675dcb6c9fed7c09c9240205c (diff)
scsi: remove private BIT macros
A couple of scsi drivers define a BIT() macro, duplicating the one in bitops.h. Cc: Jing Huang <huangj@brocade.com> Cc: Robert Love <robert.w.love@intel.com> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/scsi/bfa')
-rw-r--r--drivers/scsi/bfa/include/protocol/fcp.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/bfa/include/protocol/fcp.h b/drivers/scsi/bfa/include/protocol/fcp.h
index 9ade68ad285..74ea63ce84b 100644
--- a/drivers/scsi/bfa/include/protocol/fcp.h
+++ b/drivers/scsi/bfa/include/protocol/fcp.h
@@ -18,6 +18,7 @@
18#ifndef __FCPPROTO_H__ 18#ifndef __FCPPROTO_H__
19#define __FCPPROTO_H__ 19#define __FCPPROTO_H__
20 20
21#include <linux/bitops.h>
21#include <protocol/scsi.h> 22#include <protocol/scsi.h>
22 23
23#pragma pack(1) 24#pragma pack(1)
@@ -102,9 +103,6 @@ enum {
102/* 103/*
103 * Task management flags field - only one bit shall be set 104 * Task management flags field - only one bit shall be set
104 */ 105 */
105#ifndef BIT
106#define BIT(_x) (1 << (_x))
107#endif
108enum fcp_tm_cmnd{ 106enum fcp_tm_cmnd{
109 FCP_TM_ABORT_TASK_SET = BIT(1), 107 FCP_TM_ABORT_TASK_SET = BIT(1),
110 FCP_TM_CLEAR_TASK_SET = BIT(2), 108 FCP_TM_CLEAR_TASK_SET = BIT(2),