UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Char: sx, remove bogus iomap 

readl/writel are not expected to accept iomap return value. Replace
bogus mapping by standard ioremap.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: <R.E.Wolff@BitWizard.nl>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jiri Slaby 2008-10-18 20:27:44 -07:00 committed by Linus Torvalds
parent 8c9398d1e9
commit da1cfe1ae4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/sx.c
View File

@ -2504,7 +2504,7 @@ static void __devexit sx_remove_card(struct sx_board *board,
del_timer(&board->timer); del_timer(&board->timer);
if (pdev) { if (pdev) {
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
pci_iounmap(pdev, board->base2); iounmap(board->base2);
pci_release_region(pdev, IS_CF_BOARD(board) ? 3 : 2); pci_release_region(pdev, IS_CF_BOARD(board) ? 3 : 2);
#endif #endif
} else { } else {
@ -2677,7 +2677,7 @@ static int __devinit sx_pci_probe(struct pci_dev *pdev,
} }
board->hw_base = pci_resource_start(pdev, reg); board->hw_base = pci_resource_start(pdev, reg);
board->base2 = board->base2 =
board->base = pci_iomap(pdev, reg, WINDOW_LEN(board)); board->base = ioremap_nocache(board->hw_base, WINDOW_LEN(board));
if (!board->base) { if (!board->base) {
dev_err(&pdev->dev, "ioremap failed\n"); dev_err(&pdev->dev, "ioremap failed\n");
goto err_reg; goto err_reg;
@ -2703,7 +2703,7 @@ static int __devinit sx_pci_probe(struct pci_dev *pdev,
return 0; return 0;
err_unmap: err_unmap:
pci_iounmap(pdev, board->base2); iounmap(board->base2);
err_reg: err_reg:
pci_release_region(pdev, reg); pci_release_region(pdev, reg);
err_flag: err_flag: