Commit e503e066 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller

bnx2: Rename register read and write macros

with BNX2_ prefix for namespace consistency.  Currently, these macro names
conflict with similar macros in bnx2x.h, preventing the cnic driver from
including both bnx2.h and bnx2x.h.  Including bnx2x.h in cnic.c will remove
many redundant definitions and simplify the interface.
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d9c5a04
This diff is collapsed.
...@@ -6991,13 +6991,13 @@ struct bnx2 { ...@@ -6991,13 +6991,13 @@ struct bnx2 {
const struct firmware *rv2p_firmware; const struct firmware *rv2p_firmware;
}; };
#define REG_RD(bp, offset) \ #define BNX2_RD(bp, offset) \
readl(bp->regview + offset) readl(bp->regview + offset)
#define REG_WR(bp, offset, val) \ #define BNX2_WR(bp, offset, val) \
writel(val, bp->regview + offset) writel(val, bp->regview + offset)
#define REG_WR16(bp, offset, val) \ #define BNX2_WR16(bp, offset, val) \
writew(val, bp->regview + offset) writew(val, bp->regview + offset)
struct cpu_reg { struct cpu_reg {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment