]> err.no Git - linux-2.6/commitdiff
[ISDN] sc: Really, really fix warning
authorFrank Lichtenheld <frank@lichtenheld.de>
Wed, 14 Nov 2007 23:59:43 +0000 (15:59 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 14 Nov 2007 23:59:43 +0000 (15:59 -0800)
  CC [M]  drivers/isdn/sc/shmem.o
drivers/isdn/sc/shmem.c: In function ‘memcpy_toshmem’:
drivers/isdn/sc/shmem.c:53: warning: passing argument 1 of ‘memcpy_toio’ makes pointer from integer without a cast

Commit 9317d4313e0cd51b2256ea9a9316f2d8561e37a8:

ISDN/sc: fix longstanding warning

claimed to fix it, but it didn't.

[ Changed the "void *" to be "void __iomem *" -DaveM ]

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Acked-by:Karsten Keil <kkeilæsuse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/isdn/sc/shmem.c

index e0331e0094f1d582ad621bed719196aa1634503b..712220cef139469f93bd82ad5c97239c932d4841 100644 (file)
@@ -50,7 +50,7 @@ void memcpy_toshmem(int card, void *dest, const void *src, size_t n)
 
        outb(((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE) >> 14) | 0x80,
                sc_adapter[card]->ioport[sc_adapter[card]->shmem_pgport]);
-       memcpy_toio(sc_adapter[card]->rambase + dest_rem, src, n);
+       memcpy_toio((void __iomem *)(sc_adapter[card]->rambase + dest_rem), src, n);
        spin_unlock_irqrestore(&sc_adapter[card]->lock, flags);
        pr_debug("%s: set page to %#x\n",sc_adapter[card]->devicename,
                ((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE)>>14)|0x80);