leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bnx2: Rename register read and write macros

Browse Source 
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: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Chan 2012-12-06 10:33:08 +00:00 committed by David S. Miller
parent 1d9c5a04d5
commit e503e06624
2 changed files with 320 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

634
drivers/net/ethernet/broadcom/bnx2.c
View File

File diff suppressed because it is too large Load Diff

6
drivers/net/ethernet/broadcom/bnx2.h
View File

@ -6991,13 +6991,13 @@ struct bnx2 {
const struct firmware *rv2p_firmware;
};
#define REG_RD(bp, offset) \
#define BNX2_RD(bp, offset) \
readl(bp->regview + offset)
#define REG_WR(bp, offset, val) \
#define BNX2_WR(bp, offset, val) \
writel(val, bp->regview + offset)
#define REG_WR16(bp, offset, val) \
#define BNX2_WR16(bp, offset, val) \
writew(val, bp->regview + offset)
struct cpu_reg {