diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2008-10-18 20:27:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 08:52:36 -0700 |
| commit | da1cfe1ae48b2af7394718ec07194806db5dfe61 (patch) | |
| tree | b427498ec65ee0f62b0ec2a72b81cb0e668a3bbd /drivers/char | |
| parent | 8c9398d1e9766e3659e277acb2e8ca1c17684139 (diff) | |
| download | linux-3.10-da1cfe1ae48b2af7394718ec07194806db5dfe61.tar.gz linux-3.10-da1cfe1ae48b2af7394718ec07194806db5dfe61.tar.bz2 linux-3.10-da1cfe1ae48b2af7394718ec07194806db5dfe61.zip | |
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>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/sx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/sx.c b/drivers/char/sx.c index 5b8d7a1aa3e..ba4e86281fb 100644 --- a/drivers/char/sx.c +++ b/drivers/char/sx.c @@ -2504,7 +2504,7 @@ static void __devexit sx_remove_card(struct sx_board *board, del_timer(&board->timer); if (pdev) { #ifdef CONFIG_PCI - pci_iounmap(pdev, board->base2); + iounmap(board->base2); pci_release_region(pdev, IS_CF_BOARD(board) ? 3 : 2); #endif } else { @@ -2677,7 +2677,7 @@ static int __devinit sx_pci_probe(struct pci_dev *pdev, } board->hw_base = pci_resource_start(pdev, reg); board->base2 = - board->base = pci_iomap(pdev, reg, WINDOW_LEN(board)); + board->base = ioremap_nocache(board->hw_base, WINDOW_LEN(board)); if (!board->base) { dev_err(&pdev->dev, "ioremap failed\n"); goto err_reg; @@ -2703,7 +2703,7 @@ static int __devinit sx_pci_probe(struct pci_dev *pdev, return 0; err_unmap: - pci_iounmap(pdev, board->base2); + iounmap(board->base2); err_reg: pci_release_region(pdev, reg); err_flag: |