]> Pileus Git - ~andy/linux/commitdiff
sh: maple: PHYSADDR() -> virt_to_phys() conversion.
authorPaul Mundt <lethal@linux-sh.org>
Tue, 13 Oct 2009 03:35:30 +0000 (12:35 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 13 Oct 2009 03:35:30 +0000 (12:35 +0900)
Maple's abuse of PHYSADDR() likewise can be converted to virt_to_phys()
for its cases, although in practice this really wants explicit remapping.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
drivers/sh/maple/maple.c

index 93c20e135ee1a8412e6d4162572926e904a90f02..4e8f57d4131f10f46094d77d963ad247c08692d0 100644 (file)
@@ -106,7 +106,7 @@ static void maple_dma_reset(void)
        * max delay is 11
        */
        ctrl_outl(MAPLE_2MBPS | MAPLE_TIMEOUT(0xFFFF), MAPLE_SPEED);
-       ctrl_outl(PHYSADDR(maple_sendbuf), MAPLE_DMAADDR);
+       ctrl_outl(virt_to_phys(maple_sendbuf), MAPLE_DMAADDR);
        ctrl_outl(1, MAPLE_ENABLE);
 }
 
@@ -258,7 +258,7 @@ static void maple_build_block(struct mapleq *mq)
        maple_lastptr = maple_sendptr;
 
        *maple_sendptr++ = (port << 16) | len | 0x80000000;
-       *maple_sendptr++ = PHYSADDR(mq->recvbuf->buf);
+       *maple_sendptr++ = virt_to_phys(mq->recvbuf->buf);
        *maple_sendptr++ =
            mq->command | (to << 8) | (from << 16) | (len << 24);
        while (len-- > 0)