Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...

[pandora-kernel.git] / drivers / net / bnx2.c

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 17cbc8c..d478391 100644 (file)
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -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;
@@ -7525,9 +7525,9 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 
        /* 5708 cannot support DMA addresses > 40-bit.  */
        if (CHIP_NUM(bp) == CHIP_NUM_5708)
-               persist_dma_mask = dma_mask = DMA_40BIT_MASK;
+               persist_dma_mask = dma_mask = DMA_BIT_MASK(40);
        else
-               persist_dma_mask = dma_mask = DMA_64BIT_MASK;
+               persist_dma_mask = dma_mask = DMA_BIT_MASK(64);
 
        /* Configure DMA attributes. */
        if (pci_set_dma_mask(pdev, dma_mask) == 0) {
@@ -7538,7 +7538,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
                                "pci_set_consistent_dma_mask failed, aborting.\n");
                        goto err_out_unmap;
                }
-       } else if ((rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) != 0) {
+       } else if ((rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) {
                dev_err(&pdev->dev, "System does not support DMA, aborting.\n");
                goto err_out_unmap;
        }