aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/istallion.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/istallion.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/istallion.c')
-rw-r--r--drivers/char/istallion.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index a1427d39d933..7c8b62f162bf 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -3257,7 +3257,7 @@ static int stli_initecp(struct stlibrd *brdp)
3257 */ 3257 */
3258 EBRDINIT(brdp); 3258 EBRDINIT(brdp);
3259 3259
3260 brdp->membase = ioremap(brdp->memaddr, brdp->memsize); 3260 brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize);
3261 if (brdp->membase == NULL) { 3261 if (brdp->membase == NULL) {
3262 retval = -ENOMEM; 3262 retval = -ENOMEM;
3263 goto err_reg; 3263 goto err_reg;
@@ -3414,7 +3414,7 @@ static int stli_initonb(struct stlibrd *brdp)
3414 */ 3414 */
3415 EBRDINIT(brdp); 3415 EBRDINIT(brdp);
3416 3416
3417 brdp->membase = ioremap(brdp->memaddr, brdp->memsize); 3417 brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize);
3418 if (brdp->membase == NULL) { 3418 if (brdp->membase == NULL) {
3419 retval = -ENOMEM; 3419 retval = -ENOMEM;
3420 goto err_reg; 3420 goto err_reg;
@@ -3665,7 +3665,7 @@ static int stli_eisamemprobe(struct stlibrd *brdp)
3665 */ 3665 */
3666 for (i = 0; (i < stli_eisamempsize); i++) { 3666 for (i = 0; (i < stli_eisamempsize); i++) {
3667 brdp->memaddr = stli_eisamemprobeaddrs[i]; 3667 brdp->memaddr = stli_eisamemprobeaddrs[i];
3668 brdp->membase = ioremap(brdp->memaddr, brdp->memsize); 3668 brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize);
3669 if (brdp->membase == NULL) 3669 if (brdp->membase == NULL)
3670 continue; 3670 continue;
3671 3671