Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jiri Slaby and committed by
Linus Torvalds
da1cfe1a 8c9398d1

+3 -3
+3 -3
drivers/char/sx.c
··· 2504 2504 del_timer(&board->timer); 2505 2505 if (pdev) { 2506 2506 #ifdef CONFIG_PCI 2507 - pci_iounmap(pdev, board->base2); 2507 + iounmap(board->base2); 2508 2508 pci_release_region(pdev, IS_CF_BOARD(board) ? 3 : 2); 2509 2509 #endif 2510 2510 } else { ··· 2677 2677 } 2678 2678 board->hw_base = pci_resource_start(pdev, reg); 2679 2679 board->base2 = 2680 - board->base = pci_iomap(pdev, reg, WINDOW_LEN(board)); 2680 + board->base = ioremap_nocache(board->hw_base, WINDOW_LEN(board)); 2681 2681 if (!board->base) { 2682 2682 dev_err(&pdev->dev, "ioremap failed\n"); 2683 2683 goto err_reg; ··· 2703 2703 2704 2704 return 0; 2705 2705 err_unmap: 2706 - pci_iounmap(pdev, board->base2); 2706 + iounmap(board->base2); 2707 2707 err_reg: 2708 2708 pci_release_region(pdev, reg); 2709 2709 err_flag: