bnx2: Rename register read and write macros (e503e066) · Commits · 戴 / test

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>

drivers/net/ethernet/broadcom/bnx2.c

+318 −318

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/broadcom/bnx2.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -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 {

Admin message