CVS Update@linux-mips.org: linux

[ppopov@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ppopov@ftp.linux-mips.org       05/01/18 05:20:40

Modified files:
        sound/oss      : au1550_ac97.c 

Log message:
        Fixes some cast warnings and uses remap_pfn_range() to fix build.

diff -urN linux/sound/oss/au1550_ac97.c linux/sound/oss/au1550_ac97.c
--- linux/sound/oss/au1550_ac97.c       2004/10/20 07:08:09     1.1
+++ linux/sound/oss/au1550_ac97.c       2005/01/18 05:20:40     1.2
@@ -463,7 +463,7 @@
        /* Wait for Transmit Busy to show disabled.
        */
        do {
-               stat = readl(PSC_AC97STAT);
+               stat = readl((void *)PSC_AC97STAT);
                au_sync();
        } while ((stat & PSC_AC97STAT_TB) != 0);
 
@@ -492,7 +492,7 @@
        /* Wait for Receive Busy to show disabled.
        */
        do {
-               stat = readl(PSC_AC97STAT);
+               stat = readl((void *)PSC_AC97STAT);
                au_sync();
        } while ((stat & PSC_AC97STAT_RB) != 0);
 
@@ -542,7 +542,7 @@
        /* Wait for Device ready.
        */
        do {
-               stat = readl(PSC_AC97STAT);
+               stat = readl((void *)PSC_AC97STAT);
                au_sync();
        } while ((stat & PSC_AC97STAT_DR) == 0);
 }
@@ -574,7 +574,7 @@
        /* Wait for Device ready.
        */
        do {
-               stat = readl(PSC_AC97STAT);
+               stat = readl((void *)PSC_AC97STAT);
                au_sync();
        } while ((stat & PSC_AC97STAT_DR) == 0);
 }
@@ -1269,7 +1269,7 @@
                ret = -EINVAL;
                goto out;
        }
-       if (remap_page_range(vma, vma->vm_start, virt_to_phys(db->rawbuf),
+       if (remap_pfn_range(vma, vma->vm_start, 
page_to_pfn(virt_to_page(db->rawbuf)),
                             size, vma->vm_page_prot)) {
                ret = -EAGAIN;
                goto out;
@@ -1989,7 +1989,7 @@
        /* Wait for PSC ready.
        */
        do {
-               val = readl(PSC_AC97STAT);
+               val = readl((void *)PSC_AC97STAT);
                au_sync();
        } while ((val & PSC_AC97STAT_SR) == 0);
 
@@ -2012,7 +2012,7 @@
        /* Wait for Device ready.
        */
        do {
-               val = readl(PSC_AC97STAT);
+               val = readl((void *)PSC_AC97STAT);
                au_sync();
        } while ((val & PSC_AC97STAT_DR) == 0);