bnx2 - Don't use reserved names
Subsystems (2)
PATCH 1/1 bnx2 - Don't use reserved names
The mips identifier is reserved by gcc on mips plattforms. Don't use it in the code.
Signed-off-by Bastian Blank <[email protected]>
--- drivers/net/bnx2.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-)
drivers/net/bnx2.c +13 -13
@@ -3427,8 +3427,8 @@ static int __devinit bnx2_request_firmware(struct bnx2 *bp) {const char *mips_fw_file, *rv2p_fw_file; -const struct bnx2_mips_fw_file *mips; -const struct bnx2_rv2p_fw_file *rv2p; +const struct bnx2_mips_fw_file *mips_fw; +const struct bnx2_rv2p_fw_file *rv2p_fw;int rc;if (CHIP_NUM (bp) ==CHIP_NUM_5709 ) {
@@ -3452,21 +3452,21 @@ bnx2_request_firmware(struct bnx2 *bp) rv2p_fw_file);return rc; } - mips = (const struct bnx2_mips_fw_file *) bp->mips_firmware->data; - rv2p = (const struct bnx2_rv2p_fw_file *) bp->rv2p_firmware->data; -if (bp->mips_firmware->size <sizeof (*mips) || -check_mips_fw_entry (bp->mips_firmware, &mips->com) || -check_mips_fw_entry (bp->mips_firmware, &mips->cp) || -check_mips_fw_entry (bp->mips_firmware, &mips->rxp) || -check_mips_fw_entry (bp->mips_firmware, &mips->tpat) || -check_mips_fw_entry (bp->mips_firmware, &mips->txp)) { + mips_fw = (const struct bnx2_mips_fw_file *) bp->mips_firmware->data; + rv2p_fw = (const struct bnx2_rv2p_fw_file *) bp->rv2p_firmware->data; +if (bp->mips_firmware->size <sizeof (*mips_fw) || +check_mips_fw_entry (bp->mips_firmware, &mips_fw->com) || +check_mips_fw_entry (bp->mips_firmware, &mips_fw->cp) || +check_mips_fw_entry (bp->mips_firmware, &mips_fw->rxp) || +check_mips_fw_entry (bp->mips_firmware, &mips_fw->tpat) || +check_mips_fw_entry (bp->mips_firmware, &mips_fw->txp)) { printk(KERN_ERR PFX "Firmware file \"%s\" is invalid\n", mips_fw_file);return -EINVAL ; } -if (bp->rv2p_firmware->size <sizeof (*rv2p) || -check_fw_section (bp->rv2p_firmware, &rv2p->proc1.rv2p,8 , true) || -check_fw_section (bp->rv2p_firmware, &rv2p->proc2.rv2p,8 , true)) { +if (bp->rv2p_firmware->size <sizeof (*rv2p_fw) || +check_fw_section (bp->rv2p_firmware, &rv2p_fw->proc1.rv2p,8 , true) || +check_fw_section (bp->rv2p_firmware, &rv2p_fw->proc2.rv2p,8 , true)) { printk(KERN_ERR PFX "Firmware file \"%s\" is invalid\n", rv2p_fw_file);return -EINVAL ;
Signature · 1 line
1.6.2.2
Quoted 4 lines · Bastian Blank
The mips identifier is reserved by gcc on mips plattforms. Don't use it in the code.
Signed-off-by Bastian Blank <[email protected]>
This fixes the compile problem for me on MIPS.
Tested-by Martin Michlmayr <[email protected]>
Signature · 2 lines
Martin Michlmayr http://www.cyrius.com/
From: Martin Michlmayr <[email protected]>
Date: Wed, 8 Apr 2009 14:47:05 -0700
Quoted 9 lines · Bastian Blank
Quoted 4 lines
The mips identifier is reserved by gcc on mips plattforms. Don't use it in the code.
Signed-off-by Bastian Blank <[email protected]>This fixes the compile problem for me on MIPS.
Tested-by Martin Michlmayr <[email protected]>
Applied, thanks!