ISDN/sc: fix longstanding warning
drivers/isdn/sc/shmem.c: In function 'memcpy_toshmem': drivers/isdn/sc/shmem.c:54: warning: passing argument 1 of 'memcpy_toio' makes pointer from integer without a cast Also, remove some unneeded braces, and add some useful whitespace. Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
parent
c9927c2bf4
commit
9317d4313e
@ -28,15 +28,15 @@ void memcpy_toshmem(int card, void *dest, const void *src, size_t n)
|
|||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
unsigned char ch;
|
unsigned char ch;
|
||||||
|
unsigned long dest_rem = ((unsigned long) dest) % 0x4000;
|
||||||
|
|
||||||
if(!IS_VALID_CARD(card)) {
|
if (!IS_VALID_CARD(card)) {
|
||||||
pr_debug("Invalid param: %d is not a valid card id\n", card);
|
pr_debug("Invalid param: %d is not a valid card id\n", card);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(n > SRAM_PAGESIZE) {
|
if (n > SRAM_PAGESIZE)
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* determine the page to load from the address
|
* determine the page to load from the address
|
||||||
@ -50,8 +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,
|
outb(((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE) >> 14) | 0x80,
|
||||||
sc_adapter[card]->ioport[sc_adapter[card]->shmem_pgport]);
|
sc_adapter[card]->ioport[sc_adapter[card]->shmem_pgport]);
|
||||||
memcpy_toio(sc_adapter[card]->rambase +
|
memcpy_toio(sc_adapter[card]->rambase + dest_rem, src, n);
|
||||||
((unsigned long) dest % 0x4000), src, n);
|
|
||||||
spin_unlock_irqrestore(&sc_adapter[card]->lock, flags);
|
spin_unlock_irqrestore(&sc_adapter[card]->lock, flags);
|
||||||
pr_debug("%s: set page to %#x\n",sc_adapter[card]->devicename,
|
pr_debug("%s: set page to %#x\n",sc_adapter[card]->devicename,
|
||||||
((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE)>>14)|0x80);
|
((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE)>>14)|0x80);
|
||||||
|
Loading…
Reference in New Issue
Block a user