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>
This commit is contained in:
parent
5c90ad905b
commit
a737b88df8
|
@ -18,6 +18,7 @@
|
||||||
#ifndef __FCPPROTO_H__
|
#ifndef __FCPPROTO_H__
|
||||||
#define __FCPPROTO_H__
|
#define __FCPPROTO_H__
|
||||||
|
|
||||||
|
#include <linux/bitops.h>
|
||||||
#include <protocol/scsi.h>
|
#include <protocol/scsi.h>
|
||||||
|
|
||||||
#pragma pack(1)
|
#pragma pack(1)
|
||||||
|
@ -102,9 +103,6 @@ enum {
|
||||||
/*
|
/*
|
||||||
* Task management flags field - only one bit shall be set
|
* Task management flags field - only one bit shall be set
|
||||||
*/
|
*/
|
||||||
#ifndef BIT
|
|
||||||
#define BIT(_x) (1 << (_x))
|
|
||||||
#endif
|
|
||||||
enum fcp_tm_cmnd{
|
enum fcp_tm_cmnd{
|
||||||
FCP_TM_ABORT_TASK_SET = BIT(1),
|
FCP_TM_ABORT_TASK_SET = BIT(1),
|
||||||
FCP_TM_CLEAR_TASK_SET = BIT(2),
|
FCP_TM_CLEAR_TASK_SET = BIT(2),
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
#include <linux/netdevice.h>
|
#include <linux/netdevice.h>
|
||||||
#include <linux/workqueue.h>
|
#include <linux/workqueue.h>
|
||||||
|
#include <linux/bitops.h>
|
||||||
#include <scsi/libfc.h>
|
#include <scsi/libfc.h>
|
||||||
#include <scsi/libfcoe.h>
|
#include <scsi/libfcoe.h>
|
||||||
#include "fnic_io.h"
|
#include "fnic_io.h"
|
||||||
|
@ -49,7 +50,6 @@
|
||||||
/*
|
/*
|
||||||
* Tag bits used for special requests.
|
* Tag bits used for special requests.
|
||||||
*/
|
*/
|
||||||
#define BIT(nr) (1UL << (nr))
|
|
||||||
#define FNIC_TAG_ABORT BIT(30) /* tag bit indicating abort */
|
#define FNIC_TAG_ABORT BIT(30) /* tag bit indicating abort */
|
||||||
#define FNIC_TAG_DEV_RST BIT(29) /* indicates device reset */
|
#define FNIC_TAG_DEV_RST BIT(29) /* indicates device reset */
|
||||||
#define FNIC_TAG_MASK (BIT(24) - 1) /* mask for lookup */
|
#define FNIC_TAG_MASK (BIT(24) - 1) /* mask for lookup */
|
||||||
|
|
Loading…
Reference in New Issue