diff options
| author |   Michael Chan <mchan@broadcom.com> | 2012-12-06 10:33:08 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-12-07 12:44:01 -0500 |
| commit | e503e0662447ce2bd7c0a73c90395c78ebee494c (patch) | |
| tree | 78cbe4e2ec2b3c2df26b69f4b82821ed81fbf3e3 /drivers/net/ethernet/broadcom/bnx2.h | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next (diff) | |
| download | linux-dev-e503e0662447ce2bd7c0a73c90395c78ebee494c.tar.xz linux-dev-e503e0662447ce2bd7c0a73c90395c78ebee494c.zip | |
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: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2.h b/drivers/net/ethernet/broadcom/bnx2.h index af6451dec295..5f136745ffdd 100644 --- a/drivers/net/ethernet/broadcom/bnx2.h +++ b/drivers/net/ethernet/broadcom/bnx2.h @@ -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 { |