diff options
author | Michael Chan <mchan@broadcom.com> | 2008-01-30 00:35:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-31 22:27:14 -0500 |
commit | 2726d6e126c0c16efeba30356d4ae105f1854d1e (patch) | |
tree | e952b9ab7aebe5822d1ec9379f247708422221bf /drivers/net/bnx2.h | |
parent | 6f743ca052575a26439d796249d9e7740b8192d7 (diff) |
[BNX2]: Remove REG_WR_IND/REG_RD_IND macros.
The REG_WR_IND/REG_RD_IND macros are unnecessary and obfuscate the
code. Many callers to these macros read and write shared memory from
the bp->shmem_base, so we add 2 similar functions that automatically
add the shared memory base.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.h')
-rw-r--r-- | drivers/net/bnx2.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index 7a1eff445052..fb3c019c3a4c 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h | |||
@@ -6805,9 +6805,6 @@ struct bnx2 { | |||
6805 | int irq_nvecs; | 6805 | int irq_nvecs; |
6806 | }; | 6806 | }; |
6807 | 6807 | ||
6808 | static u32 bnx2_reg_rd_ind(struct bnx2 *bp, u32 offset); | ||
6809 | static void bnx2_reg_wr_ind(struct bnx2 *bp, u32 offset, u32 val); | ||
6810 | |||
6811 | #define REG_RD(bp, offset) \ | 6808 | #define REG_RD(bp, offset) \ |
6812 | readl(bp->regview + offset) | 6809 | readl(bp->regview + offset) |
6813 | 6810 | ||
@@ -6817,12 +6814,6 @@ static void bnx2_reg_wr_ind(struct bnx2 *bp, u32 offset, u32 val); | |||
6817 | #define REG_WR16(bp, offset, val) \ | 6814 | #define REG_WR16(bp, offset, val) \ |
6818 | writew(val, bp->regview + offset) | 6815 | writew(val, bp->regview + offset) |
6819 | 6816 | ||
6820 | #define REG_RD_IND(bp, offset) \ | ||
6821 | bnx2_reg_rd_ind(bp, offset) | ||
6822 | |||
6823 | #define REG_WR_IND(bp, offset, val) \ | ||
6824 | bnx2_reg_wr_ind(bp, offset, val) | ||
6825 | |||
6826 | /* Indirect context access. Unlike the MBQ_WR, these macros will not | 6817 | /* Indirect context access. Unlike the MBQ_WR, these macros will not |
6827 | * trigger a chip event. */ | 6818 | * trigger a chip event. */ |
6828 | static void bnx2_ctx_wr(struct bnx2 *bp, u32 cid_addr, u32 offset, u32 val); | 6819 | static void bnx2_ctx_wr(struct bnx2 *bp, u32 cid_addr, u32 offset, u32 val); |