aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/moxa.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/moxa.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/moxa.c')
-rw-r--r--drivers/char/moxa.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 585fac179ec6..d57d3a61919b 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -937,7 +937,7 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev,
937 goto err; 937 goto err;
938 } 938 }
939 939
940 board->basemem = ioremap(pci_resource_start(pdev, 2), 0x4000); 940 board->basemem = ioremap_nocache(pci_resource_start(pdev, 2), 0x4000);
941 if (board->basemem == NULL) { 941 if (board->basemem == NULL) {
942 dev_err(&pdev->dev, "can't remap io space 2\n"); 942 dev_err(&pdev->dev, "can't remap io space 2\n");
943 goto err_reg; 943 goto err_reg;
@@ -1042,7 +1042,7 @@ static int __init moxa_init(void)
1042 brd->numPorts = type[i] == MOXA_BOARD_C218_ISA ? 8 : 1042 brd->numPorts = type[i] == MOXA_BOARD_C218_ISA ? 8 :
1043 numports[i]; 1043 numports[i];
1044 brd->busType = MOXA_BUS_TYPE_ISA; 1044 brd->busType = MOXA_BUS_TYPE_ISA;
1045 brd->basemem = ioremap(baseaddr[i], 0x4000); 1045 brd->basemem = ioremap_nocache(baseaddr[i], 0x4000);
1046 if (!brd->basemem) { 1046 if (!brd->basemem) {
1047 printk(KERN_ERR "MOXA: can't remap %lx\n", 1047 printk(KERN_ERR "MOXA: can't remap %lx\n",
1048 baseaddr[i]); 1048 baseaddr[i]);