Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit a737b88df8d0b4476ae53daaa6db137df0541203

Authored by Andrew Morton
Committed by Linus Torvalds
1 parent 5c90ad905b
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 2 changed files with 2 additions and 4 deletions Side-by-side Diff

drivers/scsi/bfa/include/protocol/fcp.h
Diff comments   View file @ a737b88
... ... @@ -18,6 +18,7 @@
18 18 #ifndef __FCPPROTO_H__
19 19 #define __FCPPROTO_H__
20 20  
  21 +#include <linux/bitops.h>
21 22 #include <protocol/scsi.h>
22 23  
23 24 #pragma pack(1)
... ... @@ -102,9 +103,6 @@
102 103 /*
103 104 * Task management flags field - only one bit shall be set
104 105 */
105   -#ifndef BIT
106   -#define BIT(_x) (1 << (_x))
107   -#endif
108 106 enum fcp_tm_cmnd{
109 107 FCP_TM_ABORT_TASK_SET = BIT(1),
110 108 FCP_TM_CLEAR_TASK_SET = BIT(2),
drivers/scsi/fnic/fnic.h
Diff comments   View file @ a737b88
... ... @@ -21,6 +21,7 @@
21 21 #include <linux/interrupt.h>
22 22 #include <linux/netdevice.h>
23 23 #include <linux/workqueue.h>
  24 +#include <linux/bitops.h>
24 25 #include <scsi/libfc.h>
25 26 #include <scsi/libfcoe.h>
26 27 #include "fnic_io.h"
... ... @@ -49,7 +50,6 @@
49 50 /*
50 51 * Tag bits used for special requests.
51 52 */
52   -#define BIT(nr) (1UL << (nr))
53 53 #define FNIC_TAG_ABORT BIT(30) /* tag bit indicating abort */
54 54 #define FNIC_TAG_DEV_RST BIT(29) /* indicates device reset */
55 55 #define FNIC_TAG_MASK (BIT(24) - 1) /* mask for lookup */