diff options
Diffstat (limited to 'drivers/scsi/bnx2i/bnx2i_iscsi.c')
-rw-r--r-- | drivers/scsi/bnx2i/bnx2i_iscsi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c index f8d516b53161..621538b8b544 100644 --- a/drivers/scsi/bnx2i/bnx2i_iscsi.c +++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c | |||
@@ -811,13 +811,13 @@ struct bnx2i_hba *bnx2i_alloc_hba(struct cnic_dev *cnic) | |||
811 | bnx2i_identify_device(hba); | 811 | bnx2i_identify_device(hba); |
812 | bnx2i_setup_host_queue_size(hba, shost); | 812 | bnx2i_setup_host_queue_size(hba, shost); |
813 | 813 | ||
814 | hba->reg_base = pci_resource_start(hba->pcidev, 0); | ||
814 | if (test_bit(BNX2I_NX2_DEV_5709, &hba->cnic_dev_type)) { | 815 | if (test_bit(BNX2I_NX2_DEV_5709, &hba->cnic_dev_type)) { |
815 | hba->regview = ioremap_nocache(hba->netdev->base_addr, | 816 | hba->regview = pci_iomap(hba->pcidev, 0, BNX2_MQ_CONFIG2); |
816 | BNX2_MQ_CONFIG2); | ||
817 | if (!hba->regview) | 817 | if (!hba->regview) |
818 | goto ioreg_map_err; | 818 | goto ioreg_map_err; |
819 | } else if (test_bit(BNX2I_NX2_DEV_57710, &hba->cnic_dev_type)) { | 819 | } else if (test_bit(BNX2I_NX2_DEV_57710, &hba->cnic_dev_type)) { |
820 | hba->regview = ioremap_nocache(hba->netdev->base_addr, 4096); | 820 | hba->regview = pci_iomap(hba->pcidev, 0, 4096); |
821 | if (!hba->regview) | 821 | if (!hba->regview) |
822 | goto ioreg_map_err; | 822 | goto ioreg_map_err; |
823 | } | 823 | } |
@@ -884,7 +884,7 @@ cid_que_err: | |||
884 | bnx2i_free_mp_bdt(hba); | 884 | bnx2i_free_mp_bdt(hba); |
885 | mp_bdt_mem_err: | 885 | mp_bdt_mem_err: |
886 | if (hba->regview) { | 886 | if (hba->regview) { |
887 | iounmap(hba->regview); | 887 | pci_iounmap(hba->pcidev, hba->regview); |
888 | hba->regview = NULL; | 888 | hba->regview = NULL; |
889 | } | 889 | } |
890 | ioreg_map_err: | 890 | ioreg_map_err: |
@@ -910,7 +910,7 @@ void bnx2i_free_hba(struct bnx2i_hba *hba) | |||
910 | pci_dev_put(hba->pcidev); | 910 | pci_dev_put(hba->pcidev); |
911 | 911 | ||
912 | if (hba->regview) { | 912 | if (hba->regview) { |
913 | iounmap(hba->regview); | 913 | pci_iounmap(hba->pcidev, hba->regview); |
914 | hba->regview = NULL; | 914 | hba->regview = NULL; |
915 | } | 915 | } |
916 | bnx2i_free_mp_bdt(hba); | 916 | bnx2i_free_mp_bdt(hba); |