Commit fda4d85d authored by Michael Chan's avatar Michael Chan Committed by David S. Miller

bnx2: Fix accidental reversions.

Commit 4ce45e02
"bnx2: Add BNX2 prefix to CHIP ID and name macros"

accidentally reverted 2 commits to use pci_ioumap() and to make
pci_error_handlers const.  This fixes those mistakes.
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d4bca3d7
...@@ -8572,7 +8572,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -8572,7 +8572,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
return 0; return 0;
error: error:
iounmap(bp->regview); pci_iounmap(pdev, bp->regview);
pci_release_regions(pdev); pci_release_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
...@@ -8750,7 +8750,7 @@ static void bnx2_io_resume(struct pci_dev *pdev) ...@@ -8750,7 +8750,7 @@ static void bnx2_io_resume(struct pci_dev *pdev)
rtnl_unlock(); rtnl_unlock();
} }
static struct pci_error_handlers bnx2_err_handler = { static const struct pci_error_handlers bnx2_err_handler = {
.error_detected = bnx2_io_error_detected, .error_detected = bnx2_io_error_detected,
.slot_reset = bnx2_io_slot_reset, .slot_reset = bnx2_io_slot_reset,
.resume = bnx2_io_resume, .resume = bnx2_io_resume,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment