diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-05-01 07:34:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-01 11:04:00 -0400 |
commit | 6f441fe99814f64315b8c11890744230b990c460 (patch) | |
tree | 306cbcb8669d3a2f56b214da201c75be2ca499b9 /drivers/serial/8250_pci.c | |
parent | 4ed99a27d161ce6f1eb6657c5cd5e6aef365c665 (diff) |
8250: switch 8250 drivers to use _nocache ioremaps
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Russell King <rmk@arm.linux.org.uk>
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/serial/8250_pci.c')
-rw-r--r-- | drivers/serial/8250_pci.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index 6e57382b9137..53fa19cf2f06 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c | |||
@@ -86,7 +86,7 @@ setup_port(struct serial_private *priv, struct uart_port *port, | |||
86 | len = pci_resource_len(dev, bar); | 86 | len = pci_resource_len(dev, bar); |
87 | 87 | ||
88 | if (!priv->remapped_bar[bar]) | 88 | if (!priv->remapped_bar[bar]) |
89 | priv->remapped_bar[bar] = ioremap(base, len); | 89 | priv->remapped_bar[bar] = ioremap_nocache(base, len); |
90 | if (!priv->remapped_bar[bar]) | 90 | if (!priv->remapped_bar[bar]) |
91 | return -ENOMEM; | 91 | return -ENOMEM; |
92 | 92 | ||
@@ -270,7 +270,7 @@ static int pci_plx9050_init(struct pci_dev *dev) | |||
270 | /* | 270 | /* |
271 | * enable/disable interrupts | 271 | * enable/disable interrupts |
272 | */ | 272 | */ |
273 | p = ioremap(pci_resource_start(dev, 0), 0x80); | 273 | p = ioremap_nocache(pci_resource_start(dev, 0), 0x80); |
274 | if (p == NULL) | 274 | if (p == NULL) |
275 | return -ENOMEM; | 275 | return -ENOMEM; |
276 | writel(irq_config, p + 0x4c); | 276 | writel(irq_config, p + 0x4c); |
@@ -294,7 +294,7 @@ static void __devexit pci_plx9050_exit(struct pci_dev *dev) | |||
294 | /* | 294 | /* |
295 | * disable interrupts | 295 | * disable interrupts |
296 | */ | 296 | */ |
297 | p = ioremap(pci_resource_start(dev, 0), 0x80); | 297 | p = ioremap_nocache(pci_resource_start(dev, 0), 0x80); |
298 | if (p != NULL) { | 298 | if (p != NULL) { |
299 | writel(0, p + 0x4c); | 299 | writel(0, p + 0x4c); |
300 | 300 | ||
@@ -341,7 +341,8 @@ static int sbs_init(struct pci_dev *dev) | |||
341 | { | 341 | { |
342 | u8 __iomem *p; | 342 | u8 __iomem *p; |
343 | 343 | ||
344 | p = ioremap(pci_resource_start(dev, 0), pci_resource_len(dev, 0)); | 344 | p = ioremap_nocache(pci_resource_start(dev, 0), |
345 | pci_resource_len(dev, 0)); | ||
345 | 346 | ||
346 | if (p == NULL) | 347 | if (p == NULL) |
347 | return -ENOMEM; | 348 | return -ENOMEM; |
@@ -365,7 +366,8 @@ static void __devexit sbs_exit(struct pci_dev *dev) | |||
365 | { | 366 | { |
366 | u8 __iomem *p; | 367 | u8 __iomem *p; |
367 | 368 | ||
368 | p = ioremap(pci_resource_start(dev, 0), pci_resource_len(dev, 0)); | 369 | p = ioremap_nocache(pci_resource_start(dev, 0), |
370 | pci_resource_len(dev, 0)); | ||
369 | /* FIXME: What if resource_len < OCT_REG_CR_OFF */ | 371 | /* FIXME: What if resource_len < OCT_REG_CR_OFF */ |
370 | if (p != NULL) | 372 | if (p != NULL) |
371 | writeb(0, p + OCT_REG_CR_OFF); | 373 | writeb(0, p + OCT_REG_CR_OFF); |
@@ -419,7 +421,7 @@ static int pci_siig10x_init(struct pci_dev *dev) | |||
419 | break; | 421 | break; |
420 | } | 422 | } |
421 | 423 | ||
422 | p = ioremap(pci_resource_start(dev, 0), 0x80); | 424 | p = ioremap_nocache(pci_resource_start(dev, 0), 0x80); |
423 | if (p == NULL) | 425 | if (p == NULL) |
424 | return -ENOMEM; | 426 | return -ENOMEM; |
425 | 427 | ||