From f7f66b78cb8695974e207100e127696019e85575 Mon Sep 17 00:00:00 2001 From: Jing Huang Date: Fri, 19 Mar 2010 11:06:44 -0700 Subject: [PATCH] --- yaml --- r: 195603 b: refs/heads/master c: b3522f08ec7011aed0abc477bfedd00d189e9cd6 h: refs/heads/master i: 195601: d78f06f30593b8d4d21987119493ac7f9669a96e 195599: b3146f292252597096ffa2416cfabe20ab16ef0d v: v3 --- [refs] | 2 +- trunk/drivers/scsi/bfa/bfad.c | 9 +-------- trunk/drivers/scsi/bfa/bfad_drv.h | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index d046daa0127f..e559193c08f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2eba0d4c000777ce43012d7fda806b075f6cf877 +refs/heads/master: b3522f08ec7011aed0abc477bfedd00d189e9cd6 diff --git a/trunk/drivers/scsi/bfa/bfad.c b/trunk/drivers/scsi/bfa/bfad.c index 3a5163d3675d..0baeabadb5b2 100644 --- a/trunk/drivers/scsi/bfa/bfad.c +++ b/trunk/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 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad) 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/trunk/drivers/scsi/bfa/bfad_drv.h b/trunk/drivers/scsi/bfa/bfad_drv.h index f4b14396c4ac..0639aedcb610 100644 --- a/trunk/drivers/scsi/bfa/bfad_drv.h +++ b/trunk/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;