[SCSI] bfa: use pci_iomap() and pci_iounmap()

Use pci_iomap() and pci_iounmap() to simplify the code. Remove uncessary #ifdef
check for ia64 (it was added as a workaound for some RHEL 5.x release which
doesn't export iounmap function)

Signed-off-by: Jing Huang <huangj@brocade.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index 3a5163d3675d113aba36920b33cef1db1934ae37..0baeabadb5b276e70c5715c924a4ec8fb40fa094 100644 (file)
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -590,7 +590,6 @@ bfad_init_timer(struct bfad_s *bfad)
 int
 bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad)
 {
-       unsigned long   bar0_len;
        int             rc = -ENODEV;
 
        if (pci_enable_device(pdev)) {
@@ -610,9 +609,7 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad)
                        goto out_release_region;
                }
 
-       bfad->pci_bar0_map = pci_resource_start(pdev, 0);
-       bar0_len = pci_resource_len(pdev, 0);
-       bfad->pci_bar0_kva = ioremap(bfad->pci_bar0_map, bar0_len);
+       bfad->pci_bar0_kva = pci_iomap(pdev, 0, pci_resource_len(pdev, 0));
 
        if (bfad->pci_bar0_kva == NULL) {
                BFA_PRINTF(BFA_ERR, "Fail to map bar0\n");
@@ -645,11 +642,7 @@ out:
 void
 bfad_pci_uninit(struct pci_dev *pdev, struct bfad_s *bfad)
 {
-#if defined(__ia64__)
        pci_iounmap(pdev, bfad->pci_bar0_kva);
-#else
-       iounmap(bfad->pci_bar0_kva);
-#endif
        pci_release_regions(pdev);
        pci_disable_device(pdev);
        pci_set_drvdata(pdev, NULL);

diff --git a/drivers/scsi/bfa/bfad_drv.h b/drivers/scsi/bfa/bfad_drv.h
index f4b14396c4ac994ed39be5ca74a979d7d4c57596..0639aedcb610cc690ff165d3c7dc3efa1c662aaf 100644 (file)
--- a/drivers/scsi/bfa/bfad_drv.h
+++ b/drivers/scsi/bfa/bfad_drv.h
@@ -162,7 +162,6 @@ struct bfad_s {
        const char *pci_name;
        struct bfa_pcidev_s hal_pcidev;
        struct bfa_ioc_pci_attr_s pci_attr;
-       unsigned long   pci_bar0_map;
        void __iomem   *pci_bar0_kva;
        struct completion comp;
        struct completion suspend;