aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/sx.c
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2008-04-30 03:54:19 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 11:29:48 -0400
commit24cb233520f01971d6d873cb52c64bbbb0665ac0 (patch)
tree08ee88564a13e1a07132a59e6119b5affbd13cad /drivers/char/sx.c
parenta6fc819ebe2d70c92e43e14adbb93a5bd8ea5aa3 (diff)
char serial: switch drivers to ioremap_nocache
Simple search/replace except for synclink.c where I noticed a real bug and fixed it too. It was doing NULL + offset, then checking for NULL if the remap failed. Signed-off-by: Alan Cox <alan@redhat.com> Cc: Paul Fulghum <paulkf@microgate.com> Acked-by: Jiri Slaby <jirislaby@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/sx.c')
-rw-r--r--drivers/char/sx.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index e97a21db3d4..4ad2c71b45f 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -2540,7 +2540,7 @@ static int __devinit sx_eisa_probe(struct device *dev)
2540 goto err_flag; 2540 goto err_flag;
2541 } 2541 }
2542 board->base2 = 2542 board->base2 =
2543 board->base = ioremap(board->hw_base, SI2_EISA_WINDOW_LEN); 2543 board->base = ioremap_nocache(board->hw_base, SI2_EISA_WINDOW_LEN);
2544 if (!board->base) { 2544 if (!board->base) {
2545 dev_err(dev, "can't remap memory\n"); 2545 dev_err(dev, "can't remap memory\n");
2546 goto err_reg; 2546 goto err_reg;
@@ -2617,7 +2617,7 @@ static void __devinit fix_sx_pci(struct pci_dev *pdev, struct sx_board *board)
2617 2617
2618 pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &hwbase); 2618 pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &hwbase);
2619 hwbase &= PCI_BASE_ADDRESS_MEM_MASK; 2619 hwbase &= PCI_BASE_ADDRESS_MEM_MASK;
2620 rebase = ioremap(hwbase, 0x80); 2620 rebase = ioremap_nocache(hwbase, 0x80);
2621 t = readl(rebase + CNTRL_REG_OFFSET); 2621 t = readl(rebase + CNTRL_REG_OFFSET);
2622 if (t != CNTRL_REG_GOODVALUE) { 2622 if (t != CNTRL_REG_GOODVALUE) {
2623 printk(KERN_DEBUG "sx: performing cntrl reg fix: %08x -> " 2623 printk(KERN_DEBUG "sx: performing cntrl reg fix: %08x -> "
@@ -2761,7 +2761,7 @@ static int __init sx_init(void)
2761 if (!request_region(board->hw_base, board->hw_len, "sx")) 2761 if (!request_region(board->hw_base, board->hw_len, "sx"))
2762 continue; 2762 continue;
2763 board->base2 = 2763 board->base2 =
2764 board->base = ioremap(board->hw_base, board->hw_len); 2764 board->base = ioremap_nocache(board->hw_base, board->hw_len);
2765 if (!board->base) 2765 if (!board->base)
2766 goto err_sx_reg; 2766 goto err_sx_reg;
2767 board->flags &= ~SX_BOARD_TYPE; 2767 board->flags &= ~SX_BOARD_TYPE;
@@ -2785,7 +2785,7 @@ err_sx_reg:
2785 if (!request_region(board->hw_base, board->hw_len, "sx")) 2785 if (!request_region(board->hw_base, board->hw_len, "sx"))
2786 continue; 2786 continue;
2787 board->base2 = 2787 board->base2 =
2788 board->base = ioremap(board->hw_base, board->hw_len); 2788 board->base = ioremap_nocache(board->hw_base, board->hw_len);
2789 if (!board->base) 2789 if (!board->base)
2790 goto err_si_reg; 2790 goto err_si_reg;
2791 board->flags &= ~SX_BOARD_TYPE; 2791 board->flags &= ~SX_BOARD_TYPE;
@@ -2808,7 +2808,7 @@ err_si_reg:
2808 if (!request_region(board->hw_base, board->hw_len, "sx")) 2808 if (!request_region(board->hw_base, board->hw_len, "sx"))
2809 continue; 2809 continue;
2810 board->base2 = 2810 board->base2 =
2811 board->base = ioremap(board->hw_base, board->hw_len); 2811 board->base = ioremap_nocache(board->hw_base, board->hw_len);
2812 if (!board->base) 2812 if (!board->base)
2813 goto err_si1_reg; 2813 goto err_si1_reg;
2814 board->flags &= ~SX_BOARD_TYPE; 2814 board->flags &= ~SX_BOARD_TYPE;