From a0c846df37604a67907d2553ed26a1a8f8700bd6 Mon Sep 17 00:00:00 2001 From: Jens Taprogge Date: Thu, 27 Sep 2012 12:37:27 +0200 Subject: [PATCH] --- yaml --- r: 337025 b: refs/heads/master c: b412e893974126467f2241a044e1850d703643bb h: refs/heads/master i: 337023: 6da1d79141178e6d19a7a217876a663d857b1d57 v: v3 --- [refs] | 2 +- trunk/drivers/staging/ipack/bridges/tpci200.c | 10 ---------- trunk/drivers/staging/ipack/bridges/tpci200.h | 2 -- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index e2bb47ccb187..83413d1d275d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e91795c8cea4287b155862793271fe6a7737d20 +refs/heads/master: b412e893974126467f2241a044e1850d703643bb diff --git a/trunk/drivers/staging/ipack/bridges/tpci200.c b/trunk/drivers/staging/ipack/bridges/tpci200.c index ee66129f0b8a..a80429003558 100644 --- a/trunk/drivers/staging/ipack/bridges/tpci200.c +++ b/trunk/drivers/staging/ipack/bridges/tpci200.c @@ -78,8 +78,6 @@ static void tpci200_unregister(struct tpci200_board *tpci200) free_irq(tpci200->info->pdev->irq, (void *) tpci200); pci_iounmap(tpci200->info->pdev, tpci200->info->interface_regs); - pci_iounmap(tpci200->info->pdev, tpci200->info->ioidint_space); - pci_iounmap(tpci200->info->pdev, tpci200->info->mem8_space); pci_iounmap(tpci200->info->pdev, tpci200->info->cfg_regs); pci_release_region(tpci200->info->pdev, TPCI200_IP_INTERFACE_BAR); @@ -289,14 +287,6 @@ static int tpci200_register(struct tpci200_board *tpci200) ioremap_nocache(pci_resource_start(tpci200->info->pdev, TPCI200_IP_INTERFACE_BAR), TPCI200_IFACE_SIZE); - tpci200->info->ioidint_space = - ioremap_nocache(pci_resource_start(tpci200->info->pdev, - TPCI200_IO_ID_INT_SPACES_BAR), - TPCI200_IOIDINT_SIZE); - tpci200->info->mem8_space = - ioremap_nocache(pci_resource_start(tpci200->info->pdev, - TPCI200_MEM8_SPACE_BAR), - TPCI200_MEM8_SIZE); /* Initialize lock that protects interface_regs */ spin_lock_init(&tpci200->regs_lock); diff --git a/trunk/drivers/staging/ipack/bridges/tpci200.h b/trunk/drivers/staging/ipack/bridges/tpci200.h index 235d1fe4f48c..e4ed0a38ceb3 100644 --- a/trunk/drivers/staging/ipack/bridges/tpci200.h +++ b/trunk/drivers/staging/ipack/bridges/tpci200.h @@ -156,8 +156,6 @@ struct tpci200_infos { struct pci_dev *pdev; struct pci_device_id *id_table; struct tpci200_regs __iomem *interface_regs; - void __iomem *ioidint_space; - void __iomem *mem8_space; void __iomem *cfg_regs; struct ipack_bus_device *ipack_bus; };