 ./drivers/scsi/bfa/include/protocol/fcp.h |    4 +---
 ./drivers/scsi/fnic/fnic.h                |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

./drivers/scsi/bfa/include/protocol/fcp.h renamed from ./drivers/scsi/bfa/include/protocol/fcp.h~scsi-remove-private-bit-macros +1 -3

diff -puN ./drivers/scsi/bfa/include/protocol/fcp.h~scsi-remove-private-bit-macros ./drivers/scsi/bfa/include/protocol/fcp.h
@@ -18,6 +18,7 @@
 #ifndef __FCPPROTO_H__
 #define __FCPPROTO_H__
 
+#include <linux/bitops.h>
 #include <protocol/scsi.h>
 
 #pragma pack(1)

@@ -102,9 +103,6 @@ enum {
 /*
  * Task management flags field - only one bit shall be set
  */
-#ifndef BIT
-#define BIT(_x)	(1 << (_x))
-#endif
 enum fcp_tm_cmnd{
 	FCP_TM_ABORT_TASK_SET	= BIT(1),
 	FCP_TM_CLEAR_TASK_SET	= BIT(2),

./drivers/scsi/fnic/fnic.h renamed from ./drivers/scsi/fnic/fnic.h~scsi-remove-private-bit-macros +1 -1

diff -puN ./drivers/scsi/fnic/fnic.h~scsi-remove-private-bit-macros ./drivers/scsi/fnic/fnic.h
@@ -21,6 +21,7 @@
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/workqueue.h>
+#include <linux/bitops.h>
 #include <scsi/libfc.h>
 #include <scsi/libfcoe.h>
 #include "fnic_io.h"

@@ -49,7 +50,6 @@
 /*
  * Tag bits used for special requests.
  */
-#define BIT(nr)			(1UL << (nr))
 #define FNIC_TAG_ABORT		BIT(30)		/* tag bit indicating abort */
 #define FNIC_TAG_DEV_RST	BIT(29)		/* indicates device reset */
 #define FNIC_TAG_MASK		(BIT(24) - 1)	/* mask for lookup */