nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

Staging: ipack/bridges/tpci200: reorder the iounmap and pci_release_region

Browse source 
Move iounmap and pci_release_region to tpci200_unregister(), as it is the place
where the clean-up of the device is done.

Also, renamed iounmap() to pci_iounmap() as the mapped region was requested
from PCI bus.

Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Samuel Iglesias Gonsálvez 2012-09-11 13:35:04 +02:00 committed by Greg Kroah-Hartman
parent a92caeb8e1
commit 7987812295
1 changed files with 2 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/staging/ipack/bridges/tpci200.c
View file

@ -64,10 +64,12 @@ static void tpci200_unregister(struct tpci200_board *tpci200)
pci_iounmap(tpci200->info->pdev, tpci200->info->interface_regs); 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->ioidint_space);
pci_iounmap(tpci200->info->pdev, tpci200->info->mem8_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); pci_release_region(tpci200->info->pdev, TPCI200_IP_INTERFACE_BAR);
pci_release_region(tpci200->info->pdev, TPCI200_IO_ID_INT_SPACES_BAR); pci_release_region(tpci200->info->pdev, TPCI200_IO_ID_INT_SPACES_BAR);
pci_release_region(tpci200->info->pdev, TPCI200_MEM8_SPACE_BAR); pci_release_region(tpci200->info->pdev, TPCI200_MEM8_SPACE_BAR);
pci_release_region(tpci200->info->pdev, TPCI200_CFG_MEM_BAR);
pci_disable_device(tpci200->info->pdev); pci_disable_device(tpci200->info->pdev);
pci_dev_put(tpci200->info->pdev); pci_dev_put(tpci200->info->pdev);
@ -750,9 +752,6 @@ static void __tpci200_pci_remove(struct tpci200_board *tpci200)
tpci200_uninstall(tpci200); tpci200_uninstall(tpci200);
ipack_bus_unregister(tpci200->info->ipack_bus); ipack_bus_unregister(tpci200->info->ipack_bus);
iounmap(tpci200->info->cfg_regs);
pci_release_region(tpci200->info->pdev, TPCI200_CFG_MEM_BAR);
kfree(tpci200->info); kfree(tpci200->info);
kfree(tpci200); kfree(tpci200);
} }